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
0b66169a
Commit
0b66169a
authored
Dec 31, 2010
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Dec 31, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: COM cleanup for the IDispatchEx iface in DispatchEx.
parent
2e2f88af
Hide whitespace changes
Inline
Side-by-side
Showing
38 changed files
with
304 additions
and
240 deletions
+304
-240
dispex.c
dlls/mshtml/dispex.c
+29
-28
htmlanchor.c
dlls/mshtml/htmlanchor.c
+7
-5
htmlbody.c
dlls/mshtml/htmlbody.c
+8
-5
htmlcomment.c
dlls/mshtml/htmlcomment.c
+7
-5
htmlcurstyle.c
dlls/mshtml/htmlcurstyle.c
+5
-4
htmldoc.c
dlls/mshtml/htmldoc.c
+2
-2
htmlelem.c
dlls/mshtml/htmlelem.c
+16
-16
htmlelem2.c
dlls/mshtml/htmlelem2.c
+10
-8
htmlelem3.c
dlls/mshtml/htmlelem3.c
+5
-4
htmlelemcol.c
dlls/mshtml/htmlelemcol.c
+5
-4
htmlembed.c
dlls/mshtml/htmlembed.c
+7
-5
htmlevent.c
dlls/mshtml/htmlevent.c
+5
-4
htmlform.c
dlls/mshtml/htmlform.c
+7
-5
htmlframe.c
dlls/mshtml/htmlframe.c
+8
-5
htmlframebase.c
dlls/mshtml/htmlframebase.c
+6
-5
htmlgeneric.c
dlls/mshtml/htmlgeneric.c
+7
-5
htmliframe.c
dlls/mshtml/htmliframe.c
+8
-5
htmlimg.c
dlls/mshtml/htmlimg.c
+7
-5
htmlinput.c
dlls/mshtml/htmlinput.c
+13
-10
htmllocation.c
dlls/mshtml/htmllocation.c
+5
-4
htmlnode.c
dlls/mshtml/htmlnode.c
+16
-13
htmlobject.c
dlls/mshtml/htmlobject.c
+8
-5
htmloption.c
dlls/mshtml/htmloption.c
+7
-5
htmlscript.c
dlls/mshtml/htmlscript.c
+7
-5
htmlselect.c
dlls/mshtml/htmlselect.c
+7
-5
htmlstyle.c
dlls/mshtml/htmlstyle.c
+5
-4
htmlstyle2.c
dlls/mshtml/htmlstyle2.c
+5
-4
htmlstyle3.c
dlls/mshtml/htmlstyle3.c
+10
-8
htmlstyleelem.c
dlls/mshtml/htmlstyleelem.c
+7
-5
htmlstylesheet.c
dlls/mshtml/htmlstylesheet.c
+5
-4
htmltable.c
dlls/mshtml/htmltable.c
+7
-5
htmltablerow.c
dlls/mshtml/htmltablerow.c
+7
-5
htmltextarea.c
dlls/mshtml/htmltextarea.c
+7
-5
htmltextcont.c
dlls/mshtml/htmltextcont.c
+7
-5
htmltextnode.c
dlls/mshtml/htmltextnode.c
+6
-5
htmlwindow.c
dlls/mshtml/htmlwindow.c
+15
-12
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-3
omnavigator.c
dlls/mshtml/omnavigator.c
+10
-8
No files found.
dlls/mshtml/dispex.c
View file @
0b66169a
...
...
@@ -514,7 +514,7 @@ static ULONG WINAPI Function_AddRef(IUnknown *iface)
TRACE
(
"(%p)
\n
"
,
This
);
return
IDispatchEx_AddRef
(
DISPATCHEX
(
This
->
obj
)
);
return
IDispatchEx_AddRef
(
&
This
->
obj
->
IDispatchEx_iface
);
}
static
ULONG
WINAPI
Function_Release
(
IUnknown
*
iface
)
...
...
@@ -523,7 +523,7 @@ static ULONG WINAPI Function_Release(IUnknown *iface)
TRACE
(
"(%p)
\n
"
,
This
);
return
IDispatchEx_Release
(
DISPATCHEX
(
This
->
obj
)
);
return
IDispatchEx_Release
(
&
This
->
obj
->
IDispatchEx_iface
);
}
#undef FUNCTION_THIS
...
...
@@ -635,7 +635,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags,
}
V_VT
(
res
)
=
VT_DISPATCH
;
V_DISPATCH
(
res
)
=
(
IDispatch
*
)
DISPATCHEX
(
&
dynamic_data
->
func_disps
[
func
->
func_disp_idx
]
->
dispex
)
;
V_DISPATCH
(
res
)
=
(
IDispatch
*
)
&
dynamic_data
->
func_disps
[
func
->
func_disp_idx
]
->
dispex
.
IDispatchEx_iface
;
IDispatch_AddRef
(
V_DISPATCH
(
res
));
hres
=
S_OK
;
break
;
...
...
@@ -777,32 +777,35 @@ HRESULT remove_prop(DispatchEx *This, BSTR name, VARIANT_BOOL *success)
return
S_OK
;
}
#define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface)
static
inline
DispatchEx
*
impl_from_IDispatchEx
(
IDispatchEx
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
DispatchEx
,
IDispatchEx_iface
);
}
static
HRESULT
WINAPI
DispatchEx_QueryInterface
(
IDispatchEx
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
return
IUnknown_QueryInterface
(
This
->
outer
,
riid
,
ppv
);
}
static
ULONG
WINAPI
DispatchEx_AddRef
(
IDispatchEx
*
iface
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
return
IUnknown_AddRef
(
This
->
outer
);
}
static
ULONG
WINAPI
DispatchEx_Release
(
IDispatchEx
*
iface
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
return
IUnknown_Release
(
This
->
outer
);
}
static
HRESULT
WINAPI
DispatchEx_GetTypeInfoCount
(
IDispatchEx
*
iface
,
UINT
*
pctinfo
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
pctinfo
);
...
...
@@ -813,7 +816,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti
static
HRESULT
WINAPI
DispatchEx_GetTypeInfo
(
IDispatchEx
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
HRESULT
hres
;
TRACE
(
"(%p)->(%u %u %p)
\n
"
,
This
,
iTInfo
,
lcid
,
ppTInfo
);
...
...
@@ -830,7 +833,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
UINT
i
;
HRESULT
hres
;
...
...
@@ -838,7 +841,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid,
lcid
,
rgDispId
);
for
(
i
=
0
;
i
<
cNames
;
i
++
)
{
hres
=
IDispatchEx_GetDispID
(
DISPATCHEX
(
This
)
,
rgszNames
[
i
],
0
,
rgDispId
+
i
);
hres
=
IDispatchEx_GetDispID
(
&
This
->
IDispatchEx_iface
,
rgszNames
[
i
],
0
,
rgDispId
+
i
);
if
(
FAILED
(
hres
))
return
hres
;
}
...
...
@@ -850,18 +853,18 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,
REFIID
riid
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
TRACE
(
"(%p)->(%d %s %d %d %p %p %p %p)
\n
"
,
This
,
dispIdMember
,
debugstr_guid
(
riid
),
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_InvokeEx
(
DISPATCHEX
(
This
),
dispIdMember
,
lcid
,
wFlag
s
,
pDispParams
,
pVarResult
,
pExcepInfo
,
NULL
);
return
IDispatchEx_InvokeEx
(
&
This
->
IDispatchEx_iface
,
dispIdMember
,
lcid
,
wFlags
,
pDispParam
s
,
pVarResult
,
pExcepInfo
,
NULL
);
}
static
HRESULT
WINAPI
DispatchEx_GetDispID
(
IDispatchEx
*
iface
,
BSTR
bstrName
,
DWORD
grfdex
,
DISPID
*
pid
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
dynamic_prop_t
*
dprop
;
HRESULT
hres
;
...
...
@@ -885,7 +888,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW
static
HRESULT
WINAPI
DispatchEx_InvokeEx
(
IDispatchEx
*
iface
,
DISPID
id
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pdp
,
VARIANT
*
pvarRes
,
EXCEPINFO
*
pei
,
IServiceProvider
*
pspCaller
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
HRESULT
hres
;
TRACE
(
"(%p)->(%x %x %x %p %p %p %p)
\n
"
,
This
,
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
...
...
@@ -941,7 +944,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
memcpy
(
dp
.
rgvarg
+
1
,
pdp
->
rgvarg
,
pdp
->
cArgs
*
sizeof
(
VARIANTARG
));
V_VT
(
dp
.
rgvarg
)
=
VT_DISPATCH
;
V_DISPATCH
(
dp
.
rgvarg
)
=
(
IDispatch
*
)
DISPATCHEX
(
This
)
;
V_DISPATCH
(
dp
.
rgvarg
)
=
(
IDispatch
*
)
&
This
->
IDispatchEx_iface
;
hres
=
IDispatch_QueryInterface
(
V_DISPATCH
(
&
prop
->
var
),
&
IID_IDispatchEx
,
(
void
**
)
&
dispex
);
TRACE
(
"%s call
\n
"
,
debugstr_w
(
This
->
dynamic_data
->
props
[
idx
].
name
));
...
...
@@ -988,7 +991,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
static
HRESULT
WINAPI
DispatchEx_DeleteMemberByName
(
IDispatchEx
*
iface
,
BSTR
bstrName
,
DWORD
grfdex
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
TRACE
(
"(%p)->(%s %x)
\n
"
,
This
,
debugstr_w
(
bstrName
),
grfdex
);
...
...
@@ -998,21 +1001,21 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst
static
HRESULT
WINAPI
DispatchEx_DeleteMemberByDispID
(
IDispatchEx
*
iface
,
DISPID
id
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
FIXME
(
"(%p)->(%x)
\n
"
,
This
,
id
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
DispatchEx_GetMemberProperties
(
IDispatchEx
*
iface
,
DISPID
id
,
DWORD
grfdexFetch
,
DWORD
*
pgrfdex
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
FIXME
(
"(%p)->(%x %x %p)
\n
"
,
This
,
id
,
grfdexFetch
,
pgrfdex
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
DispatchEx_GetMemberName
(
IDispatchEx
*
iface
,
DISPID
id
,
BSTR
*
pbstrName
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
dispex_data_t
*
data
;
func_info_t
*
func
;
HRESULT
hres
;
...
...
@@ -1048,7 +1051,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS
static
HRESULT
WINAPI
DispatchEx_GetNextDispID
(
IDispatchEx
*
iface
,
DWORD
grfdex
,
DISPID
id
,
DISPID
*
pid
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
dispex_data_t
*
data
;
func_info_t
*
func
;
HRESULT
hres
;
...
...
@@ -1105,13 +1108,11 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex,
static
HRESULT
WINAPI
DispatchEx_GetNameSpaceParent
(
IDispatchEx
*
iface
,
IUnknown
**
ppunk
)
{
DispatchEx
*
This
=
DISPATCHEX_THIS
(
iface
);
DispatchEx
*
This
=
impl_from_IDispatchEx
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
ppunk
);
return
E_NOTIMPL
;
}
#undef DISPATCHEX_THIS
static
IDispatchExVtbl
DispatchExVtbl
=
{
DispatchEx_QueryInterface
,
DispatchEx_AddRef
,
...
...
@@ -1139,10 +1140,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv)
if
(
IsEqualGUID
(
&
IID_IDispatch
,
riid
))
{
TRACE
(
"(%p)->(IID_IDispatch %p)
\n
"
,
This
,
ppv
);
*
ppv
=
DISPATCHEX
(
This
)
;
*
ppv
=
&
This
->
IDispatchEx_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IDispatchEx
,
riid
))
{
TRACE
(
"(%p)->(IID_IDispatchEx %p)
\n
"
,
This
,
ppv
);
*
ppv
=
DISPATCHEX
(
This
)
;
*
ppv
=
&
This
->
IDispatchEx_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IDispatchJS
,
riid
))
{
TRACE
(
"(%p)->(IID_IDispatchJS %p) returning NULL
\n
"
,
This
,
ppv
);
*
ppv
=
NULL
;
...
...
@@ -1190,7 +1191,7 @@ void release_dispex(DispatchEx *This)
void
init_dispex
(
DispatchEx
*
dispex
,
IUnknown
*
outer
,
dispex_static_data_t
*
data
)
{
dispex
->
lpIDispatchEx
Vtbl
=
&
DispatchExVtbl
;
dispex
->
IDispatchEx_iface
.
lp
Vtbl
=
&
DispatchExVtbl
;
dispex
->
outer
=
outer
;
dispex
->
data
=
data
;
dispex
->
dynamic_data
=
NULL
;
...
...
dlls/mshtml/htmlanchor.c
View file @
0b66169a
...
...
@@ -70,14 +70,15 @@ static ULONG WINAPI HTMLAnchorElement_Release(IHTMLAnchorElement *iface)
static
HRESULT
WINAPI
HTMLAnchorElement_GetTypeInfoCount
(
IHTMLAnchorElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLAnchorElement
*
This
=
impl_from_IHTMLAnchorElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLAnchorElement_GetTypeInfo
(
IHTMLAnchorElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLAnchorElement
*
This
=
impl_from_IHTMLAnchorElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLAnchorElement_GetIDsOfNames
(
IHTMLAnchorElement
*
iface
,
REFIID
riid
,
...
...
@@ -85,7 +86,8 @@ static HRESULT WINAPI HTMLAnchorElement_GetIDsOfNames(IHTMLAnchorElement *iface,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLAnchorElement
*
This
=
impl_from_IHTMLAnchorElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLAnchorElement_Invoke
(
IHTMLAnchorElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -93,8 +95,8 @@ static HRESULT WINAPI HTMLAnchorElement_Invoke(IHTMLAnchorElement *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLAnchorElement
*
This
=
impl_from_IHTMLAnchorElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lc
id
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
ri
id
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLAnchorElement_put_href
(
IHTMLAnchorElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlbody.c
View file @
0b66169a
...
...
@@ -223,14 +223,16 @@ static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface)
static
HRESULT
WINAPI
HTMLBodyElement_GetTypeInfoCount
(
IHTMLBodyElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLBodyElement
*
This
=
impl_from_IHTMLBodyElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
textcont
.
element
.
node
.
dispex
),
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
textcont
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLBodyElement_GetTypeInfo
(
IHTMLBodyElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLBodyElement
*
This
=
impl_from_IHTMLBodyElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
textcont
.
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
textcont
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLBodyElement_GetIDsOfNames
(
IHTMLBodyElement
*
iface
,
REFIID
riid
,
...
...
@@ -238,7 +240,8 @@ static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REF
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLBodyElement
*
This
=
impl_from_IHTMLBodyElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
textcont
.
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
textcont
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLBodyElement_Invoke
(
IHTMLBodyElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -246,8 +249,8 @@ static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dis
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLBodyElement
*
This
=
impl_from_IHTMLBodyElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
textcont
.
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
textcont
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLBodyElement_put_background
(
IHTMLBodyElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlcomment.c
View file @
0b66169a
...
...
@@ -66,14 +66,15 @@ static ULONG WINAPI HTMLCommentElement_Release(IHTMLCommentElement *iface)
static
HRESULT
WINAPI
HTMLCommentElement_GetTypeInfoCount
(
IHTMLCommentElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLCommentElement
*
This
=
HTMLCOMMENT_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLCommentElement_GetTypeInfo
(
IHTMLCommentElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLCommentElement
*
This
=
HTMLCOMMENT_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLCommentElement_GetIDsOfNames
(
IHTMLCommentElement
*
iface
,
REFIID
riid
,
...
...
@@ -81,7 +82,8 @@ static HRESULT WINAPI HTMLCommentElement_GetIDsOfNames(IHTMLCommentElement *ifac
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLCommentElement
*
This
=
HTMLCOMMENT_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLCommentElement_Invoke
(
IHTMLCommentElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -89,8 +91,8 @@ static HRESULT WINAPI HTMLCommentElement_Invoke(IHTMLCommentElement *iface, DISP
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLCommentElement
*
This
=
HTMLCOMMENT_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lc
id
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
ri
id
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLCommentElement_put_text
(
IHTMLCommentElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlcurstyle.c
View file @
0b66169a
...
...
@@ -100,21 +100,22 @@ static ULONG WINAPI HTMLCurrentStyle_Release(IHTMLCurrentStyle *iface)
static
HRESULT
WINAPI
HTMLCurrentStyle_GetTypeInfoCount
(
IHTMLCurrentStyle
*
iface
,
UINT
*
pctinfo
)
{
HTMLCurrentStyle
*
This
=
HTMLCURSTYLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLCurrentStyle_GetTypeInfo
(
IHTMLCurrentStyle
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLCurrentStyle
*
This
=
HTMLCURSTYLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLCurrentStyle_GetIDsOfNames
(
IHTMLCurrentStyle
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLCurrentStyle
*
This
=
HTMLCURSTYLE_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLCurrentStyle_Invoke
(
IHTMLCurrentStyle
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -122,7 +123,7 @@ static HRESULT WINAPI HTMLCurrentStyle_Invoke(IHTMLCurrentStyle *iface, DISPID d
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLCurrentStyle
*
This
=
HTMLCURSTYLE_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmldoc.c
View file @
0b66169a
...
...
@@ -1990,7 +1990,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLWindow *wi
init_dispex
(
&
doc
->
node
.
dispex
,
(
IUnknown
*
)
&
doc
->
node
.
IHTMLDOMNode_iface
,
&
HTMLDocumentNode_dispex
);
init_doc
(
&
doc
->
basedoc
,
(
IUnknown
*
)
&
doc
->
node
.
IHTMLDOMNode_iface
,
DISPATCHEX
(
&
doc
->
node
.
dispex
)
);
&
doc
->
node
.
dispex
.
IDispatchEx_iface
);
HTMLDocumentNode_SecMgr_Init
(
doc
);
init_nsevents
(
doc
);
...
...
@@ -2204,7 +2204,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject)
return
E_OUTOFMEMORY
;
init_dispex
(
&
doc
->
dispex
,
(
IUnknown
*
)
CUSTOMDOC
(
doc
),
&
HTMLDocumentObj_dispex
);
init_doc
(
&
doc
->
basedoc
,
(
IUnknown
*
)
CUSTOMDOC
(
doc
),
DISPATCHEX
(
&
doc
->
dispex
)
);
init_doc
(
&
doc
->
basedoc
,
(
IUnknown
*
)
CUSTOMDOC
(
doc
),
&
doc
->
dispex
.
IDispatchEx_iface
);
doc
->
lpCustomDocVtbl
=
&
CustomDocVtbl
;
doc
->
ref
=
1
;
...
...
dlls/mshtml/htmlelem.c
View file @
0b66169a
...
...
@@ -172,14 +172,14 @@ static ULONG WINAPI HTMLElement_Release(IHTMLElement *iface)
static
HRESULT
WINAPI
HTMLElement_GetTypeInfoCount
(
IHTMLElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLElement_GetTypeInfo
(
IHTMLElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLElement_GetIDsOfNames
(
IHTMLElement
*
iface
,
REFIID
riid
,
...
...
@@ -187,7 +187,8 @@ static HRESULT WINAPI HTMLElement_GetIDsOfNames(IHTMLElement *iface, REFIID riid
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLElement_Invoke
(
IHTMLElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -195,7 +196,7 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
@@ -210,7 +211,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr
TRACE
(
"(%p)->(%s . %08x)
\n
"
,
This
,
debugstr_w
(
strAttributeName
),
lFlags
);
hres
=
IDispatchEx_GetDispID
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
strAttributeName
,
hres
=
IDispatchEx_GetDispID
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
strAttributeName
,
fdexNameCaseInsensitive
|
fdexNameEnsure
,
&
dispid
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -220,9 +221,8 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr
dispParams
.
rgdispidNamedArgs
=
&
dispidNamed
;
dispParams
.
rgvarg
=
&
AttributeValue
;
hres
=
IDispatchEx_InvokeEx
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
dispid
,
LOCALE_SYSTEM_DEFAULT
,
DISPATCH_PROPERTYPUT
,
&
dispParams
,
NULL
,
&
excep
,
NULL
);
hres
=
IDispatchEx_InvokeEx
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
dispid
,
LOCALE_SYSTEM_DEFAULT
,
DISPATCH_PROPERTYPUT
,
&
dispParams
,
NULL
,
&
excep
,
NULL
);
return
hres
;
}
...
...
@@ -237,7 +237,7 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr
TRACE
(
"(%p)->(%s %08x %p)
\n
"
,
This
,
debugstr_w
(
strAttributeName
),
lFlags
,
AttributeValue
);
hres
=
IDispatchEx_GetDispID
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
strAttributeName
,
hres
=
IDispatchEx_GetDispID
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
strAttributeName
,
fdexNameCaseInsensitive
,
&
dispid
);
if
(
hres
==
DISP_E_UNKNOWNNAME
)
{
V_VT
(
AttributeValue
)
=
VT_NULL
;
...
...
@@ -249,9 +249,8 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr
return
hres
;
}
hres
=
IDispatchEx_InvokeEx
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
dispid
,
LOCALE_SYSTEM_DEFAULT
,
DISPATCH_PROPERTYGET
,
&
dispParams
,
AttributeValue
,
&
excep
,
NULL
);
hres
=
IDispatchEx_InvokeEx
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
dispid
,
LOCALE_SYSTEM_DEFAULT
,
DISPATCH_PROPERTYGET
,
&
dispParams
,
AttributeValue
,
&
excep
,
NULL
);
return
hres
;
}
...
...
@@ -1832,14 +1831,14 @@ static ULONG WINAPI HTMLFiltersCollection_Release(IHTMLFiltersCollection *iface)
static
HRESULT
WINAPI
HTMLFiltersCollection_GetTypeInfoCount
(
IHTMLFiltersCollection
*
iface
,
UINT
*
pctinfo
)
{
HTMLFiltersCollection
*
This
=
impl_from_IHTMLFiltersCollection
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLFiltersCollection_GetTypeInfo
(
IHTMLFiltersCollection
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLFiltersCollection
*
This
=
impl_from_IHTMLFiltersCollection
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLFiltersCollection_GetIDsOfNames
(
IHTMLFiltersCollection
*
iface
,
...
...
@@ -1847,7 +1846,8 @@ static HRESULT WINAPI HTMLFiltersCollection_GetIDsOfNames(IHTMLFiltersCollection
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLFiltersCollection
*
This
=
impl_from_IHTMLFiltersCollection
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLFiltersCollection_Invoke
(
IHTMLFiltersCollection
*
iface
,
DISPID
dispIdMember
,
REFIID
riid
,
...
...
@@ -1855,7 +1855,7 @@ static HRESULT WINAPI HTMLFiltersCollection_Invoke(IHTMLFiltersCollection *iface
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLFiltersCollection
*
This
=
impl_from_IHTMLFiltersCollection
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlelem2.c
View file @
0b66169a
...
...
@@ -108,7 +108,7 @@ static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo,
{
HTMLRect
*
This
=
impl_from_IHTMLRect
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLRect_GetIDsOfNames
(
IHTMLRect
*
iface
,
REFIID
riid
,
...
...
@@ -116,7 +116,8 @@ static HRESULT WINAPI HTMLRect_GetIDsOfNames(IHTMLRect *iface, REFIID riid,
{
HTMLRect
*
This
=
impl_from_IHTMLRect
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLRect_Invoke
(
IHTMLRect
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -125,8 +126,8 @@ static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember,
{
HTMLRect
*
This
=
impl_from_IHTMLRect
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParam
s
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlag
s
,
p
DispParams
,
p
VarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLRect_put_left
(
IHTMLRect
*
iface
,
LONG
v
)
...
...
@@ -305,14 +306,14 @@ static ULONG WINAPI HTMLElement2_Release(IHTMLElement2 *iface)
static
HRESULT
WINAPI
HTMLElement2_GetTypeInfoCount
(
IHTMLElement2
*
iface
,
UINT
*
pctinfo
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement2
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLElement2_GetTypeInfo
(
IHTMLElement2
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement2
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLElement2_GetIDsOfNames
(
IHTMLElement2
*
iface
,
REFIID
riid
,
...
...
@@ -320,7 +321,8 @@ static HRESULT WINAPI HTMLElement2_GetIDsOfNames(IHTMLElement2 *iface, REFIID ri
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement2
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLElement2_Invoke
(
IHTMLElement2
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -328,7 +330,7 @@ static HRESULT WINAPI HTMLElement2_Invoke(IHTMLElement2 *iface, DISPID dispIdMem
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement2
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlelem3.c
View file @
0b66169a
...
...
@@ -60,14 +60,14 @@ static ULONG WINAPI HTMLElement3_Release(IHTMLElement3 *iface)
static
HRESULT
WINAPI
HTMLElement3_GetTypeInfoCount
(
IHTMLElement3
*
iface
,
UINT
*
pctinfo
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement3
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLElement3_GetTypeInfo
(
IHTMLElement3
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement3
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLElement3_GetIDsOfNames
(
IHTMLElement3
*
iface
,
REFIID
riid
,
...
...
@@ -75,7 +75,8 @@ static HRESULT WINAPI HTMLElement3_GetIDsOfNames(IHTMLElement3 *iface, REFIID ri
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement3
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLElement3_Invoke
(
IHTMLElement3
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -83,7 +84,7 @@ static HRESULT WINAPI HTMLElement3_Invoke(IHTMLElement3 *iface, DISPID dispIdMem
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLElement
*
This
=
impl_from_IHTMLElement3
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlelemcol.c
View file @
0b66169a
...
...
@@ -150,21 +150,22 @@ static HRESULT WINAPI HTMLElementCollection_GetTypeInfoCount(IHTMLElementCollect
UINT
*
pctinfo
)
{
HTMLElementCollection
*
This
=
impl_from_IHTMLElementCollection
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLElementCollection_GetTypeInfo
(
IHTMLElementCollection
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLElementCollection
*
This
=
impl_from_IHTMLElementCollection
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLElementCollection_GetIDsOfNames
(
IHTMLElementCollection
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLElementCollection
*
This
=
impl_from_IHTMLElementCollection
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLElementCollection_Invoke
(
IHTMLElementCollection
*
iface
,
...
...
@@ -172,7 +173,7 @@ static HRESULT WINAPI HTMLElementCollection_Invoke(IHTMLElementCollection *iface
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLElementCollection
*
This
=
impl_from_IHTMLElementCollection
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlembed.c
View file @
0b66169a
...
...
@@ -67,21 +67,23 @@ static ULONG WINAPI HTMLEmbedElement_Release(IHTMLEmbedElement *iface)
static
HRESULT
WINAPI
HTMLEmbedElement_GetTypeInfoCount
(
IHTMLEmbedElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLEmbedElement
*
This
=
HTMLEMBED_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLEmbedElement_GetTypeInfo
(
IHTMLEmbedElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLEmbedElement
*
This
=
HTMLEMBED_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLEmbedElement_GetIDsOfNames
(
IHTMLEmbedElement
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLEmbedElement
*
This
=
HTMLEMBED_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLEmbedElement_Invoke
(
IHTMLEmbedElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -89,8 +91,8 @@ static HRESULT WINAPI HTMLEmbedElement_Invoke(IHTMLEmbedElement *iface, DISPID d
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLEmbedElement
*
This
=
HTMLEMBED_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLEmbedElement_put_hidden
(
IHTMLEmbedElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlevent.c
View file @
0b66169a
...
...
@@ -289,14 +289,14 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface)
static
HRESULT
WINAPI
HTMLEventObj_GetTypeInfoCount
(
IHTMLEventObj
*
iface
,
UINT
*
pctinfo
)
{
HTMLEventObj
*
This
=
impl_from_IHTMLEventObj
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLEventObj_GetTypeInfo
(
IHTMLEventObj
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLEventObj
*
This
=
impl_from_IHTMLEventObj
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLEventObj_GetIDsOfNames
(
IHTMLEventObj
*
iface
,
REFIID
riid
,
...
...
@@ -304,7 +304,8 @@ static HRESULT WINAPI HTMLEventObj_GetIDsOfNames(IHTMLEventObj *iface, REFIID ri
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLEventObj
*
This
=
impl_from_IHTMLEventObj
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLEventObj_Invoke
(
IHTMLEventObj
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -312,7 +313,7 @@ static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMem
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLEventObj
*
This
=
impl_from_IHTMLEventObj
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlform.c
View file @
0b66169a
...
...
@@ -104,14 +104,15 @@ static ULONG WINAPI HTMLFormElement_Release(IHTMLFormElement *iface)
static
HRESULT
WINAPI
HTMLFormElement_GetTypeInfoCount
(
IHTMLFormElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLFormElement
*
This
=
HTMLFORM_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLFormElement_GetTypeInfo
(
IHTMLFormElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLFormElement
*
This
=
HTMLFORM_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLFormElement_GetIDsOfNames
(
IHTMLFormElement
*
iface
,
REFIID
riid
,
...
...
@@ -119,7 +120,8 @@ static HRESULT WINAPI HTMLFormElement_GetIDsOfNames(IHTMLFormElement *iface, REF
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLFormElement
*
This
=
HTMLFORM_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLFormElement_Invoke
(
IHTMLFormElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -127,8 +129,8 @@ static HRESULT WINAPI HTMLFormElement_Invoke(IHTMLFormElement *iface, DISPID dis
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLFormElement
*
This
=
HTMLFORM_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLFormElement_put_action
(
IHTMLFormElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlframe.c
View file @
0b66169a
...
...
@@ -66,21 +66,24 @@ static ULONG WINAPI HTMLFrameElement3_Release(IHTMLFrameElement3 *iface)
static
HRESULT
WINAPI
HTMLFrameElement3_GetTypeInfoCount
(
IHTMLFrameElement3
*
iface
,
UINT
*
pctinfo
)
{
HTMLFrameElement
*
This
=
impl_from_IHTMLFrameElement3
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLFrameElement3_GetTypeInfo
(
IHTMLFrameElement3
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLFrameElement
*
This
=
impl_from_IHTMLFrameElement3
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLFrameElement3_GetIDsOfNames
(
IHTMLFrameElement3
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLFrameElement
*
This
=
impl_from_IHTMLFrameElement3
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLFrameElement3_Invoke
(
IHTMLFrameElement3
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -88,8 +91,8 @@ static HRESULT WINAPI HTMLFrameElement3_Invoke(IHTMLFrameElement3 *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLFrameElement
*
This
=
impl_from_IHTMLFrameElement3
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLFrameElement3_get_contentDocument
(
IHTMLFrameElement3
*
iface
,
IDispatch
**
p
)
...
...
dlls/mshtml/htmlframebase.c
View file @
0b66169a
...
...
@@ -88,7 +88,7 @@ static HRESULT WINAPI HTMLFrameBase_GetTypeInfoCount(IHTMLFrameBase *iface, UINT
{
HTMLFrameBase
*
This
=
HTMLFRAMEBASE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLFrameBase_GetTypeInfo
(
IHTMLFrameBase
*
iface
,
UINT
iTInfo
,
...
...
@@ -96,7 +96,8 @@ static HRESULT WINAPI HTMLFrameBase_GetTypeInfo(IHTMLFrameBase *iface, UINT iTIn
{
HTMLFrameBase
*
This
=
HTMLFRAMEBASE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLFrameBase_GetIDsOfNames
(
IHTMLFrameBase
*
iface
,
REFIID
riid
,
...
...
@@ -104,7 +105,7 @@ static HRESULT WINAPI HTMLFrameBase_GetIDsOfNames(IHTMLFrameBase *iface, REFIID
{
HTMLFrameBase
*
This
=
HTMLFRAMEBASE_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
riid
,
rgszNames
,
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
...
...
@@ -114,8 +115,8 @@ static HRESULT WINAPI HTMLFrameBase_Invoke(IHTMLFrameBase *iface, DISPID dispIdM
{
HTMLFrameBase
*
This
=
HTMLFRAMEBASE_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lc
id
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
ri
id
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLFrameBase_put_src
(
IHTMLFrameBase
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlgeneric.c
View file @
0b66169a
...
...
@@ -67,21 +67,23 @@ static ULONG WINAPI HTMLGenericElement_Release(IHTMLGenericElement *iface)
static
HRESULT
WINAPI
HTMLGenericElement_GetTypeInfoCount
(
IHTMLGenericElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLGenericElement
*
This
=
impl_from_IHTMLGenericElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLGenericElement_GetTypeInfo
(
IHTMLGenericElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLGenericElement
*
This
=
impl_from_IHTMLGenericElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLGenericElement_GetIDsOfNames
(
IHTMLGenericElement
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLGenericElement
*
This
=
impl_from_IHTMLGenericElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLGenericElement_Invoke
(
IHTMLGenericElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -89,8 +91,8 @@ static HRESULT WINAPI HTMLGenericElement_Invoke(IHTMLGenericElement *iface, DISP
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLGenericElement
*
This
=
impl_from_IHTMLGenericElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLGenericElement_get_recordset
(
IHTMLGenericElement
*
iface
,
IDispatch
**
p
)
...
...
dlls/mshtml/htmliframe.c
View file @
0b66169a
...
...
@@ -66,21 +66,24 @@ static ULONG WINAPI HTMLIFrameElement_Release(IHTMLIFrameElement *iface)
static
HRESULT
WINAPI
HTMLIFrameElement_GetTypeInfoCount
(
IHTMLIFrameElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLIFrame
*
This
=
impl_from_IHTMLIFrameElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLIFrameElement_GetTypeInfo
(
IHTMLIFrameElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLIFrame
*
This
=
impl_from_IHTMLIFrameElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLIFrameElement_GetIDsOfNames
(
IHTMLIFrameElement
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLIFrame
*
This
=
impl_from_IHTMLIFrameElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLIFrameElement_Invoke
(
IHTMLIFrameElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -88,8 +91,8 @@ static HRESULT WINAPI HTMLIFrameElement_Invoke(IHTMLIFrameElement *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLIFrame
*
This
=
impl_from_IHTMLIFrameElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
framebase
.
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
framebase
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLIFrameElement_put_vspace
(
IHTMLIFrameElement
*
iface
,
LONG
v
)
...
...
dlls/mshtml/htmlimg.c
View file @
0b66169a
...
...
@@ -69,14 +69,15 @@ static ULONG WINAPI HTMLImgElement_Release(IHTMLImgElement *iface)
static
HRESULT
WINAPI
HTMLImgElement_GetTypeInfoCount
(
IHTMLImgElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLImgElement
*
This
=
impl_from_IHTMLImgElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLImgElement_GetTypeInfo
(
IHTMLImgElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLImgElement
*
This
=
impl_from_IHTMLImgElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLImgElement_GetIDsOfNames
(
IHTMLImgElement
*
iface
,
REFIID
riid
,
...
...
@@ -84,7 +85,8 @@ static HRESULT WINAPI HTMLImgElement_GetIDsOfNames(IHTMLImgElement *iface, REFII
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLImgElement
*
This
=
impl_from_IHTMLImgElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLImgElement_Invoke
(
IHTMLImgElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -92,8 +94,8 @@ static HRESULT WINAPI HTMLImgElement_Invoke(IHTMLImgElement *iface, DISPID dispI
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLImgElement
*
This
=
impl_from_IHTMLImgElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLImgElement_put_isMap
(
IHTMLImgElement
*
iface
,
VARIANT_BOOL
v
)
...
...
dlls/mshtml/htmlinput.c
View file @
0b66169a
...
...
@@ -77,7 +77,7 @@ static HRESULT WINAPI HTMLInputElement_GetTypeInfoCount(IHTMLInputElement *iface
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLInputElement_GetTypeInfo
(
IHTMLInputElement
*
iface
,
UINT
iTInfo
,
...
...
@@ -85,7 +85,8 @@ static HRESULT WINAPI HTMLInputElement_GetTypeInfo(IHTMLInputElement *iface, UIN
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLInputElement_GetIDsOfNames
(
IHTMLInputElement
*
iface
,
REFIID
riid
,
...
...
@@ -94,7 +95,7 @@ static HRESULT WINAPI HTMLInputElement_GetIDsOfNames(IHTMLInputElement *iface, R
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
riid
,
rgszNames
,
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
...
...
@@ -104,8 +105,8 @@ static HRESULT WINAPI HTMLInputElement_Invoke(IHTMLInputElement *iface, DISPID d
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLInputElement_put_type
(
IHTMLInputElement
*
iface
,
BSTR
v
)
...
...
@@ -845,21 +846,23 @@ static ULONG WINAPI HTMLInputTextElement_Release(IHTMLInputTextElement *iface)
static
HRESULT
WINAPI
HTMLInputTextElement_GetTypeInfoCount
(
IHTMLInputTextElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputTextElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLInputTextElement_GetTypeInfo
(
IHTMLInputTextElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputTextElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLInputTextElement_GetIDsOfNames
(
IHTMLInputTextElement
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputTextElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLInputTextElement_Invoke
(
IHTMLInputTextElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -867,8 +870,8 @@ static HRESULT WINAPI HTMLInputTextElement_Invoke(IHTMLInputTextElement *iface,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLInputElement
*
This
=
impl_from_IHTMLInputTextElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLInputTextElement_get_type
(
IHTMLInputTextElement
*
iface
,
BSTR
*
p
)
...
...
dlls/mshtml/htmllocation.c
View file @
0b66169a
...
...
@@ -121,14 +121,14 @@ static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface)
static
HRESULT
WINAPI
HTMLLocation_GetTypeInfoCount
(
IHTMLLocation
*
iface
,
UINT
*
pctinfo
)
{
HTMLLocation
*
This
=
HTMLLOCATION_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLLocation_GetTypeInfo
(
IHTMLLocation
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLLocation
*
This
=
HTMLLOCATION_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLLocation_GetIDsOfNames
(
IHTMLLocation
*
iface
,
REFIID
riid
,
...
...
@@ -136,7 +136,8 @@ static HRESULT WINAPI HTMLLocation_GetIDsOfNames(IHTMLLocation *iface, REFIID ri
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLLocation
*
This
=
HTMLLOCATION_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLLocation_Invoke
(
IHTMLLocation
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -144,7 +145,7 @@ static HRESULT WINAPI HTMLLocation_Invoke(IHTMLLocation *iface, DISPID dispIdMem
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLLocation
*
This
=
HTMLLOCATION_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlnode.c
View file @
0b66169a
...
...
@@ -105,21 +105,22 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection
static
HRESULT
WINAPI
HTMLDOMChildrenCollection_GetTypeInfoCount
(
IHTMLDOMChildrenCollection
*
iface
,
UINT
*
pctinfo
)
{
HTMLDOMChildrenCollection
*
This
=
impl_from_IHTMLDOMChildrenCollection
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLDOMChildrenCollection_GetTypeInfo
(
IHTMLDOMChildrenCollection
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLDOMChildrenCollection
*
This
=
impl_from_IHTMLDOMChildrenCollection
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLDOMChildrenCollection_GetIDsOfNames
(
IHTMLDOMChildrenCollection
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLDOMChildrenCollection
*
This
=
impl_from_IHTMLDOMChildrenCollection
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLDOMChildrenCollection_Invoke
(
IHTMLDOMChildrenCollection
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -127,7 +128,7 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollectio
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLDOMChildrenCollection
*
This
=
impl_from_IHTMLDOMChildrenCollection
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
@@ -334,14 +335,14 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface)
static
HRESULT
WINAPI
HTMLDOMNode_GetTypeInfoCount
(
IHTMLDOMNode
*
iface
,
UINT
*
pctinfo
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLDOMNode_GetTypeInfo
(
IHTMLDOMNode
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLDOMNode_GetIDsOfNames
(
IHTMLDOMNode
*
iface
,
REFIID
riid
,
...
...
@@ -349,7 +350,8 @@ static HRESULT WINAPI HTMLDOMNode_GetIDsOfNames(IHTMLDOMNode *iface, REFIID riid
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLDOMNode_Invoke
(
IHTMLDOMNode
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -357,7 +359,7 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
@@ -869,14 +871,14 @@ static ULONG WINAPI HTMLDOMNode2_Release(IHTMLDOMNode2 *iface)
static
HRESULT
WINAPI
HTMLDOMNode2_GetTypeInfoCount
(
IHTMLDOMNode2
*
iface
,
UINT
*
pctinfo
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode2
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLDOMNode2_GetTypeInfo
(
IHTMLDOMNode2
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode2
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLDOMNode2_GetIDsOfNames
(
IHTMLDOMNode2
*
iface
,
REFIID
riid
,
...
...
@@ -884,7 +886,8 @@ static HRESULT WINAPI HTMLDOMNode2_GetIDsOfNames(IHTMLDOMNode2 *iface, REFIID ri
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode2
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLDOMNode2_Invoke
(
IHTMLDOMNode2
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -892,7 +895,7 @@ static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMem
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLDOMNode
*
This
=
impl_from_IHTMLDOMNode2
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
@@ -936,7 +939,7 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv)
}
else
if
(
IsEqualGUID
(
&
IID_IDispatchEx
,
riid
))
{
if
(
This
->
dispex
.
data
)
{
TRACE
(
"(%p)->(IID_IDispatchEx %p)
\n
"
,
This
,
ppv
);
*
ppv
=
DISPATCHEX
(
&
This
->
dispex
)
;
*
ppv
=
&
This
->
dispex
.
IDispatchEx_iface
;
}
else
{
FIXME
(
"(%p)->(IID_IDispatchEx %p)
\n
"
,
This
,
ppv
);
return
E_NOINTERFACE
;
...
...
dlls/mshtml/htmlobject.c
View file @
0b66169a
...
...
@@ -72,14 +72,16 @@ static ULONG WINAPI HTMLObjectElement_Release(IHTMLObjectElement *iface)
static
HRESULT
WINAPI
HTMLObjectElement_GetTypeInfoCount
(
IHTMLObjectElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLObjectElement
*
This
=
impl_from_IHTMLObjectElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
plugin_container
.
element
.
node
.
dispex
),
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
plugin_container
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLObjectElement_GetTypeInfo
(
IHTMLObjectElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLObjectElement
*
This
=
impl_from_IHTMLObjectElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
plugin_container
.
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
plugin_container
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLObjectElement_GetIDsOfNames
(
IHTMLObjectElement
*
iface
,
REFIID
riid
,
...
...
@@ -87,7 +89,8 @@ static HRESULT WINAPI HTMLObjectElement_GetIDsOfNames(IHTMLObjectElement *iface,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLObjectElement
*
This
=
impl_from_IHTMLObjectElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
plugin_container
.
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
plugin_container
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLObjectElement_Invoke
(
IHTMLObjectElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -95,8 +98,8 @@ static HRESULT WINAPI HTMLObjectElement_Invoke(IHTMLObjectElement *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLObjectElement
*
This
=
impl_from_IHTMLObjectElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
plugin_container
.
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
plugin_container
.
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLObjectElement_get_object
(
IHTMLObjectElement
*
iface
,
IDispatch
**
p
)
...
...
dlls/mshtml/htmloption.c
View file @
0b66169a
...
...
@@ -68,14 +68,15 @@ static ULONG WINAPI HTMLOptionElement_Release(IHTMLOptionElement *iface)
static
HRESULT
WINAPI
HTMLOptionElement_GetTypeInfoCount
(
IHTMLOptionElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLOptionElement
*
This
=
HTMLOPTION_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLOptionElement_GetTypeInfo
(
IHTMLOptionElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLOptionElement
*
This
=
HTMLOPTION_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLOptionElement_GetIDsOfNames
(
IHTMLOptionElement
*
iface
,
REFIID
riid
,
...
...
@@ -83,7 +84,8 @@ static HRESULT WINAPI HTMLOptionElement_GetIDsOfNames(IHTMLOptionElement *iface,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLOptionElement
*
This
=
HTMLOPTION_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLOptionElement_Invoke
(
IHTMLOptionElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -91,8 +93,8 @@ static HRESULT WINAPI HTMLOptionElement_Invoke(IHTMLOptionElement *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLOptionElement
*
This
=
HTMLOPTION_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLOptionElement_put_selected
(
IHTMLOptionElement
*
iface
,
VARIANT_BOOL
v
)
...
...
dlls/mshtml/htmlscript.c
View file @
0b66169a
...
...
@@ -69,14 +69,15 @@ static ULONG WINAPI HTMLScriptElement_Release(IHTMLScriptElement *iface)
static
HRESULT
WINAPI
HTMLScriptElement_GetTypeInfoCount
(
IHTMLScriptElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLScriptElement
*
This
=
impl_from_IHTMLScriptElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLScriptElement_GetTypeInfo
(
IHTMLScriptElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLScriptElement
*
This
=
impl_from_IHTMLScriptElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLScriptElement_GetIDsOfNames
(
IHTMLScriptElement
*
iface
,
REFIID
riid
,
...
...
@@ -84,7 +85,8 @@ static HRESULT WINAPI HTMLScriptElement_GetIDsOfNames(IHTMLScriptElement *iface,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLScriptElement
*
This
=
impl_from_IHTMLScriptElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLScriptElement_Invoke
(
IHTMLScriptElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -92,8 +94,8 @@ static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLScriptElement
*
This
=
impl_from_IHTMLScriptElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLScriptElement_put_src
(
IHTMLScriptElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlselect.c
View file @
0b66169a
...
...
@@ -107,7 +107,7 @@ static HRESULT WINAPI HTMLSelectElement_GetTypeInfoCount(IHTMLSelectElement *ifa
{
HTMLSelectElement
*
This
=
impl_from_IHTMLSelectElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLSelectElement_GetTypeInfo
(
IHTMLSelectElement
*
iface
,
UINT
iTInfo
,
...
...
@@ -115,7 +115,8 @@ static HRESULT WINAPI HTMLSelectElement_GetTypeInfo(IHTMLSelectElement *iface, U
{
HTMLSelectElement
*
This
=
impl_from_IHTMLSelectElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLSelectElement_GetIDsOfNames
(
IHTMLSelectElement
*
iface
,
REFIID
riid
,
...
...
@@ -124,7 +125,8 @@ static HRESULT WINAPI HTMLSelectElement_GetIDsOfNames(IHTMLSelectElement *iface,
{
HTMLSelectElement
*
This
=
impl_from_IHTMLSelectElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLSelectElement_Invoke
(
IHTMLSelectElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -133,8 +135,8 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID
{
HTMLSelectElement
*
This
=
impl_from_IHTMLSelectElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lc
id
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
ri
id
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLSelectElement_put_size
(
IHTMLSelectElement
*
iface
,
LONG
v
)
...
...
dlls/mshtml/htmlstyle.c
View file @
0b66169a
...
...
@@ -620,14 +620,14 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface)
static
HRESULT
WINAPI
HTMLStyle_GetTypeInfoCount
(
IHTMLStyle
*
iface
,
UINT
*
pctinfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyle_GetTypeInfo
(
IHTMLStyle
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLStyle_GetIDsOfNames
(
IHTMLStyle
*
iface
,
REFIID
riid
,
...
...
@@ -635,7 +635,8 @@ static HRESULT WINAPI HTMLStyle_GetIDsOfNames(IHTMLStyle *iface, REFIID riid,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLStyle_Invoke
(
IHTMLStyle
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -643,7 +644,7 @@ static HRESULT WINAPI HTMLStyle_Invoke(IHTMLStyle *iface, DISPID dispIdMember,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlstyle2.c
View file @
0b66169a
...
...
@@ -59,14 +59,14 @@ static ULONG WINAPI HTMLStyle2_Release(IHTMLStyle2 *iface)
static
HRESULT
WINAPI
HTMLStyle2_GetTypeInfoCount
(
IHTMLStyle2
*
iface
,
UINT
*
pctinfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE2_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyle2_GetTypeInfo
(
IHTMLStyle2
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE2_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLStyle2_GetIDsOfNames
(
IHTMLStyle2
*
iface
,
REFIID
riid
,
...
...
@@ -74,7 +74,8 @@ static HRESULT WINAPI HTMLStyle2_GetIDsOfNames(IHTMLStyle2 *iface, REFIID riid,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyle
*
This
=
HTMLSTYLE2_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLStyle2_Invoke
(
IHTMLStyle2
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLStyle2_Invoke(IHTMLStyle2 *iface, DISPID dispIdMember,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyle
*
This
=
HTMLSTYLE2_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlstyle3.c
View file @
0b66169a
...
...
@@ -59,14 +59,14 @@ static ULONG WINAPI HTMLStyle3_Release(IHTMLStyle3 *iface)
static
HRESULT
WINAPI
HTMLStyle3_GetTypeInfoCount
(
IHTMLStyle3
*
iface
,
UINT
*
pctinfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE3_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyle3_GetTypeInfo
(
IHTMLStyle3
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE3_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLStyle3_GetIDsOfNames
(
IHTMLStyle3
*
iface
,
REFIID
riid
,
...
...
@@ -74,7 +74,8 @@ static HRESULT WINAPI HTMLStyle3_GetIDsOfNames(IHTMLStyle3 *iface, REFIID riid,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyle
*
This
=
HTMLSTYLE3_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLStyle3_Invoke
(
IHTMLStyle3
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLStyle3_Invoke(IHTMLStyle3 *iface, DISPID dispIdMember,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyle
*
This
=
HTMLSTYLE3_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
@@ -377,14 +378,14 @@ static ULONG WINAPI HTMLStyle4_Release(IHTMLStyle4 *iface)
static
HRESULT
WINAPI
HTMLStyle4_GetTypeInfoCount
(
IHTMLStyle4
*
iface
,
UINT
*
pctinfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyle4_GetTypeInfo
(
IHTMLStyle4
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLStyle4_GetIDsOfNames
(
IHTMLStyle4
*
iface
,
REFIID
riid
,
...
...
@@ -392,7 +393,8 @@ static HRESULT WINAPI HTMLStyle4_GetIDsOfNames(IHTMLStyle4 *iface, REFIID riid,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLStyle4_Invoke
(
IHTMLStyle4
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -400,7 +402,7 @@ static HRESULT WINAPI HTMLStyle4_Invoke(IHTMLStyle4 *iface, DISPID dispIdMember,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmlstyleelem.c
View file @
0b66169a
...
...
@@ -69,21 +69,23 @@ static ULONG WINAPI HTMLStyleElement_Release(IHTMLStyleElement *iface)
static
HRESULT
WINAPI
HTMLStyleElement_GetTypeInfoCount
(
IHTMLStyleElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLStyleElement
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyleElement_GetTypeInfo
(
IHTMLStyleElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyleElement
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLStyleElement_GetIDsOfNames
(
IHTMLStyleElement
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyleElement
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLStyleElement_Invoke
(
IHTMLStyleElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -91,8 +93,8 @@ static HRESULT WINAPI HTMLStyleElement_Invoke(IHTMLStyleElement *iface, DISPID d
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyleElement
*
This
=
HTMLSTYLE_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLStyleElement_put_type
(
IHTMLStyleElement
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstylesheet.c
View file @
0b66169a
...
...
@@ -266,21 +266,22 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_GetTypeInfoCount(IHTMLStyleSheet
UINT
*
pctinfo
)
{
HTMLStyleSheetsCollection
*
This
=
HTMLSTYLESHEETSCOL_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyleSheetsCollection_GetTypeInfo
(
IHTMLStyleSheetsCollection
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyleSheetsCollection
*
This
=
HTMLSTYLESHEETSCOL_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLStyleSheetsCollection_GetIDsOfNames
(
IHTMLStyleSheetsCollection
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyleSheetsCollection
*
This
=
HTMLSTYLESHEETSCOL_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLStyleSheetsCollection_Invoke
(
IHTMLStyleSheetsCollection
*
iface
,
...
...
@@ -288,7 +289,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_Invoke(IHTMLStyleSheetsCollectio
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyleSheetsCollection
*
This
=
HTMLSTYLESHEETSCOL_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
dlls/mshtml/htmltable.c
View file @
0b66169a
...
...
@@ -69,14 +69,15 @@ static ULONG WINAPI HTMLTable_Release(IHTMLTable *iface)
static
HRESULT
WINAPI
HTMLTable_GetTypeInfoCount
(
IHTMLTable
*
iface
,
UINT
*
pctinfo
)
{
HTMLTable
*
This
=
HTMLTABLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLTable_GetTypeInfo
(
IHTMLTable
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLTable
*
This
=
HTMLTABLE_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLTable_GetIDsOfNames
(
IHTMLTable
*
iface
,
REFIID
riid
,
...
...
@@ -84,7 +85,8 @@ static HRESULT WINAPI HTMLTable_GetIDsOfNames(IHTMLTable *iface, REFIID riid,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLTable
*
This
=
HTMLTABLE_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLTable_Invoke
(
IHTMLTable
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -92,8 +94,8 @@ static HRESULT WINAPI HTMLTable_Invoke(IHTMLTable *iface, DISPID dispIdMember,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLTable
*
This
=
HTMLTABLE_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLTable_put_cols
(
IHTMLTable
*
iface
,
LONG
v
)
...
...
dlls/mshtml/htmltablerow.c
View file @
0b66169a
...
...
@@ -69,14 +69,15 @@ static ULONG WINAPI HTMLTableRow_Release(IHTMLTableRow *iface)
static
HRESULT
WINAPI
HTMLTableRow_GetTypeInfoCount
(
IHTMLTableRow
*
iface
,
UINT
*
pctinfo
)
{
HTMLTableRow
*
This
=
impl_from_IHTMLTableRow
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLTableRow_GetTypeInfo
(
IHTMLTableRow
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLTableRow
*
This
=
impl_from_IHTMLTableRow
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLTableRow_GetIDsOfNames
(
IHTMLTableRow
*
iface
,
REFIID
riid
,
...
...
@@ -84,7 +85,8 @@ static HRESULT WINAPI HTMLTableRow_GetIDsOfNames(IHTMLTableRow *iface, REFIID ri
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLTableRow
*
This
=
impl_from_IHTMLTableRow
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLTableRow_Invoke
(
IHTMLTableRow
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -92,8 +94,8 @@ static HRESULT WINAPI HTMLTableRow_Invoke(IHTMLTableRow *iface, DISPID dispIdMem
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLTableRow
*
This
=
impl_from_IHTMLTableRow
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLTableRow_put_align
(
IHTMLTableRow
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmltextarea.c
View file @
0b66169a
...
...
@@ -69,14 +69,15 @@ static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface)
static
HRESULT
WINAPI
HTMLTextAreaElement_GetTypeInfoCount
(
IHTMLTextAreaElement
*
iface
,
UINT
*
pctinfo
)
{
HTMLTextAreaElement
*
This
=
impl_from_IHTMLTextAreaElement
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLTextAreaElement_GetTypeInfo
(
IHTMLTextAreaElement
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLTextAreaElement
*
This
=
impl_from_IHTMLTextAreaElement
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLTextAreaElement_GetIDsOfNames
(
IHTMLTextAreaElement
*
iface
,
REFIID
riid
,
...
...
@@ -84,7 +85,8 @@ static HRESULT WINAPI HTMLTextAreaElement_GetIDsOfNames(IHTMLTextAreaElement *if
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLTextAreaElement
*
This
=
impl_from_IHTMLTextAreaElement
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLTextAreaElement_Invoke
(
IHTMLTextAreaElement
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -92,8 +94,8 @@ static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DI
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLTextAreaElement
*
This
=
impl_from_IHTMLTextAreaElement
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLTextAreaElement_get_type
(
IHTMLTextAreaElement
*
iface
,
BSTR
*
p
)
...
...
dlls/mshtml/htmltextcont.c
View file @
0b66169a
...
...
@@ -58,14 +58,15 @@ static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface)
static
HRESULT
WINAPI
HTMLTextContainer_GetTypeInfoCount
(
IHTMLTextContainer
*
iface
,
UINT
*
pctinfo
)
{
HTMLTextContainer
*
This
=
HTMLTEXTCONT_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLTextContainer_GetTypeInfo
(
IHTMLTextContainer
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLTextContainer
*
This
=
HTMLTEXTCONT_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLTextContainer_GetIDsOfNames
(
IHTMLTextContainer
*
iface
,
REFIID
riid
,
...
...
@@ -73,7 +74,8 @@ static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLTextContainer
*
This
=
HTMLTEXTCONT_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLTextContainer_Invoke
(
IHTMLTextContainer
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -81,8 +83,8 @@ static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLTextContainer
*
This
=
HTMLTEXTCONT_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
element
.
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
element
.
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLTextContainer_createControlRange
(
IHTMLTextContainer
*
iface
,
...
...
dlls/mshtml/htmltextnode.c
View file @
0b66169a
...
...
@@ -68,14 +68,14 @@ static ULONG WINAPI HTMLDOMTextNode_Release(IHTMLDOMTextNode *iface)
static
HRESULT
WINAPI
HTMLDOMTextNode_GetTypeInfoCount
(
IHTMLDOMTextNode
*
iface
,
UINT
*
pctinfo
)
{
HTMLDOMTextNode
*
This
=
HTMLTEXT_THIS
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLDOMTextNode_GetTypeInfo
(
IHTMLDOMTextNode
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLDOMTextNode
*
This
=
HTMLTEXT_THIS
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
node
.
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLDOMTextNode_GetIDsOfNames
(
IHTMLDOMTextNode
*
iface
,
REFIID
riid
,
...
...
@@ -83,7 +83,8 @@ static HRESULT WINAPI HTMLDOMTextNode_GetIDsOfNames(IHTMLDOMTextNode *iface, REF
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLDOMTextNode
*
This
=
HTMLTEXT_THIS
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLDOMTextNode_Invoke
(
IHTMLDOMTextNode
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -91,8 +92,8 @@ static HRESULT WINAPI HTMLDOMTextNode_Invoke(IHTMLDOMTextNode *iface, DISPID dis
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLDOMTextNode
*
This
=
HTMLTEXT_THIS
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
node
.
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
node
.
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLDOMTextNode_put_data
(
IHTMLDOMTextNode
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlwindow.c
View file @
0b66169a
...
...
@@ -1819,7 +1819,7 @@ static HRESULT WINAPI WindowDispEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pc
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
WindowDispEx_GetTypeInfo
(
IDispatchEx
*
iface
,
UINT
iTInfo
,
...
...
@@ -1829,7 +1829,7 @@ static HRESULT WINAPI WindowDispEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo,
TRACE
(
"(%p)->(%u %u %p)
\n
"
,
This
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
WindowDispEx_GetIDsOfNames
(
IDispatchEx
*
iface
,
REFIID
riid
,
...
...
@@ -1864,8 +1864,8 @@ static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMembe
/* FIXME: Use script dispatch */
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParam
s
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlag
s
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
global_prop_t
*
alloc_global_prop
(
HTMLWindow
*
This
,
global_prop_type_t
type
,
BSTR
name
)
...
...
@@ -1942,7 +1942,7 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName,
if
(
hres
!=
DISP_E_UNKNOWNNAME
)
return
hres
;
hres
=
IDispatchEx_GetDispID
(
DISPATCHEX
(
&
This
->
dispex
)
,
bstrName
,
grfdex
,
pid
);
hres
=
IDispatchEx_GetDispID
(
&
This
->
dispex
.
IDispatchEx_iface
,
bstrName
,
grfdex
,
pid
);
if
(
hres
!=
DISP_E_UNKNOWNNAME
)
return
hres
;
...
...
@@ -1984,12 +1984,14 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID
if
(
FAILED
(
hres
))
return
hres
;
hres
=
IDispatchEx_InvokeEx
(
DISPATCHEX
(
&
location
->
dispex
),
DISPID_VALUE
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
hres
=
IDispatchEx_InvokeEx
(
&
location
->
dispex
.
IDispatchEx_iface
,
DISPID_VALUE
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
IHTMLLocation_Release
(
HTMLLOCATION
(
location
));
return
hres
;
}
return
IDispatchEx_InvokeEx
(
DISPATCHEX
(
&
This
->
dispex
),
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
return
IDispatchEx_InvokeEx
(
&
This
->
dispex
.
IDispatchEx_iface
,
id
,
lcid
,
wFlags
,
pdp
,
pvarRes
,
pei
,
pspCaller
);
}
static
HRESULT
WINAPI
WindowDispEx_DeleteMemberByName
(
IDispatchEx
*
iface
,
BSTR
bstrName
,
DWORD
grfdex
)
...
...
@@ -1998,7 +2000,7 @@ static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR b
TRACE
(
"(%p)->(%s %x)
\n
"
,
This
,
debugstr_w
(
bstrName
),
grfdex
);
return
IDispatchEx_DeleteMemberByName
(
DISPATCHEX
(
&
This
->
dispex
)
,
bstrName
,
grfdex
);
return
IDispatchEx_DeleteMemberByName
(
&
This
->
dispex
.
IDispatchEx_iface
,
bstrName
,
grfdex
);
}
static
HRESULT
WINAPI
WindowDispEx_DeleteMemberByDispID
(
IDispatchEx
*
iface
,
DISPID
id
)
...
...
@@ -2007,7 +2009,7 @@ static HRESULT WINAPI WindowDispEx_DeleteMemberByDispID(IDispatchEx *iface, DISP
TRACE
(
"(%p)->(%x)
\n
"
,
This
,
id
);
return
IDispatchEx_DeleteMemberByDispID
(
DISPATCHEX
(
&
This
->
dispex
)
,
id
);
return
IDispatchEx_DeleteMemberByDispID
(
&
This
->
dispex
.
IDispatchEx_iface
,
id
);
}
static
HRESULT
WINAPI
WindowDispEx_GetMemberProperties
(
IDispatchEx
*
iface
,
DISPID
id
,
DWORD
grfdexFetch
,
DWORD
*
pgrfdex
)
...
...
@@ -2016,7 +2018,8 @@ static HRESULT WINAPI WindowDispEx_GetMemberProperties(IDispatchEx *iface, DISPI
TRACE
(
"(%p)->(%x %x %p)
\n
"
,
This
,
id
,
grfdexFetch
,
pgrfdex
);
return
IDispatchEx_GetMemberProperties
(
DISPATCHEX
(
&
This
->
dispex
),
id
,
grfdexFetch
,
pgrfdex
);
return
IDispatchEx_GetMemberProperties
(
&
This
->
dispex
.
IDispatchEx_iface
,
id
,
grfdexFetch
,
pgrfdex
);
}
static
HRESULT
WINAPI
WindowDispEx_GetMemberName
(
IDispatchEx
*
iface
,
DISPID
id
,
BSTR
*
pbstrName
)
...
...
@@ -2025,7 +2028,7 @@ static HRESULT WINAPI WindowDispEx_GetMemberName(IDispatchEx *iface, DISPID id,
TRACE
(
"(%p)->(%x %p)
\n
"
,
This
,
id
,
pbstrName
);
return
IDispatchEx_GetMemberName
(
DISPATCHEX
(
&
This
->
dispex
)
,
id
,
pbstrName
);
return
IDispatchEx_GetMemberName
(
&
This
->
dispex
.
IDispatchEx_iface
,
id
,
pbstrName
);
}
static
HRESULT
WINAPI
WindowDispEx_GetNextDispID
(
IDispatchEx
*
iface
,
DWORD
grfdex
,
DISPID
id
,
DISPID
*
pid
)
...
...
@@ -2034,7 +2037,7 @@ static HRESULT WINAPI WindowDispEx_GetNextDispID(IDispatchEx *iface, DWORD grfde
TRACE
(
"(%p)->(%x %x %p)
\n
"
,
This
,
grfdex
,
id
,
pid
);
return
IDispatchEx_GetNextDispID
(
DISPATCHEX
(
&
This
->
dispex
)
,
grfdex
,
id
,
pid
);
return
IDispatchEx_GetNextDispID
(
&
This
->
dispex
.
IDispatchEx_iface
,
grfdex
,
id
,
pid
);
}
static
HRESULT
WINAPI
WindowDispEx_GetNameSpaceParent
(
IDispatchEx
*
iface
,
IUnknown
**
ppunk
)
...
...
dlls/mshtml/mshtml_private.h
View file @
0b66169a
...
...
@@ -187,7 +187,7 @@ typedef struct {
}
dispex_static_data_t
;
struct
DispatchEx
{
const
IDispatchExVtbl
*
lpIDispatchExVtbl
;
IDispatchEx
IDispatchEx_iface
;
IUnknown
*
outer
;
...
...
@@ -645,8 +645,6 @@ struct HTMLDocumentNode {
#define HTMLIMGFACTORY(x) ((IHTMLImageElementFactory*) &(x)->lpHTMLImageElementFactoryVtbl)
#define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl)
#define DISPATCHEX(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl)
#define HOSTSECMGR(x) ((IInternetHostSecurityManager*) &(x)->lpIInternetHostSecurityManagerVtbl)
#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))
...
...
dlls/mshtml/omnavigator.c
View file @
0b66169a
...
...
@@ -113,21 +113,22 @@ static ULONG WINAPI HTMLPluginsCollection_Release(IHTMLPluginsCollection *iface)
static
HRESULT
WINAPI
HTMLPluginsCollection_GetTypeInfoCount
(
IHTMLPluginsCollection
*
iface
,
UINT
*
pctinfo
)
{
HTMLPluginsCollection
*
This
=
impl_from_IHTMLPluginsCollection
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
DISPATCHEX
(
&
This
->
dispex
)
,
pctinfo
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLPluginsCollection_GetTypeInfo
(
IHTMLPluginsCollection
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLPluginsCollection
*
This
=
impl_from_IHTMLPluginsCollection
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
HTMLPluginsCollection_GetIDsOfNames
(
IHTMLPluginsCollection
*
iface
,
REFIID
riid
,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLPluginsCollection
*
This
=
impl_from_IHTMLPluginsCollection
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
HTMLPluginsCollection_Invoke
(
IHTMLPluginsCollection
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -135,7 +136,7 @@ static HRESULT WINAPI HTMLPluginsCollection_Invoke(IHTMLPluginsCollection *iface
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLPluginsCollection
*
This
=
impl_from_IHTMLPluginsCollection
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
)
,
dispIdMember
,
riid
,
lcid
,
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
...
...
@@ -261,7 +262,7 @@ static HRESULT WINAPI OmNavigator_GetTypeInfo(IOmNavigator *iface, UINT iTInfo,
{
OmNavigator
*
This
=
impl_from_IOmNavigator
(
iface
);
return
IDispatchEx_GetTypeInfo
(
DISPATCHEX
(
&
This
->
dispex
)
,
iTInfo
,
lcid
,
ppTInfo
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
static
HRESULT
WINAPI
OmNavigator_GetIDsOfNames
(
IOmNavigator
*
iface
,
REFIID
riid
,
...
...
@@ -270,7 +271,8 @@ static HRESULT WINAPI OmNavigator_GetIDsOfNames(IOmNavigator *iface, REFIID riid
{
OmNavigator
*
This
=
impl_from_IOmNavigator
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
DISPATCHEX
(
&
This
->
dispex
),
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
static
HRESULT
WINAPI
OmNavigator_Invoke
(
IOmNavigator
*
iface
,
DISPID
dispIdMember
,
...
...
@@ -279,8 +281,8 @@ static HRESULT WINAPI OmNavigator_Invoke(IOmNavigator *iface, DISPID dispIdMembe
{
OmNavigator
*
This
=
impl_from_IOmNavigator
(
iface
);
return
IDispatchEx_Invoke
(
DISPATCHEX
(
&
This
->
dispex
),
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParam
s
,
pVarResult
,
pExcepInfo
,
puArgErr
);
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlag
s
,
p
DispParams
,
p
VarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
OmNavigator_get_appCodeName
(
IOmNavigator
*
iface
,
BSTR
*
p
)
...
...
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