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
5590ea4a
Commit
5590ea4a
authored
Mar 16, 2021
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Rename init_dispex_with_compat_mode to init_dispatch.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
013accc3
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
37 additions
and
42 deletions
+37
-42
dispex.c
dlls/mshtml/dispex.c
+2
-2
htmlattr.c
dlls/mshtml/htmlattr.c
+1
-1
htmldoc.c
dlls/mshtml/htmldoc.c
+1
-1
htmlelem.c
dlls/mshtml/htmlelem.c
+4
-4
htmlelemcol.c
dlls/mshtml/htmlelemcol.c
+1
-1
htmlevent.c
dlls/mshtml/htmlevent.c
+3
-3
htmlimg.c
dlls/mshtml/htmlimg.c
+1
-1
htmllocation.c
dlls/mshtml/htmllocation.c
+1
-1
htmlnode.c
dlls/mshtml/htmlnode.c
+1
-1
htmlselect.c
dlls/mshtml/htmlselect.c
+1
-1
htmlstorage.c
dlls/mshtml/htmlstorage.c
+1
-1
htmlstyle.c
dlls/mshtml/htmlstyle.c
+1
-1
htmlstylesheet.c
dlls/mshtml/htmlstylesheet.c
+4
-4
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-6
omnavigator.c
dlls/mshtml/omnavigator.c
+10
-10
range.c
dlls/mshtml/range.c
+2
-2
selection.c
dlls/mshtml/selection.c
+1
-1
xmlhttprequest.c
dlls/mshtml/xmlhttprequest.c
+1
-1
No files found.
dlls/mshtml/dispex.c
View file @
5590ea4a
...
...
@@ -876,7 +876,7 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info)
return
NULL
;
ret
->
IUnknown_iface
.
lpVtbl
=
&
FunctionUnkVtbl
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
&
ret
->
IUnknown_iface
,
&
function_dispex
,
dispex_compat_mode
(
obj
));
init_disp
atch
(
&
ret
->
dispex
,
&
ret
->
IUnknown_iface
,
&
function_dispex
,
dispex_compat_mode
(
obj
));
ret
->
ref
=
1
;
ret
->
obj
=
obj
;
ret
->
info
=
info
;
...
...
@@ -1910,7 +1910,7 @@ void release_dispex(DispatchEx *This)
heap_free
(
This
->
dynamic_data
);
}
void
init_disp
ex_with_compat_mode
(
DispatchEx
*
dispex
,
IUnknown
*
outer
,
dispex_static_data_t
*
data
,
compat_mode_t
compat_mode
)
void
init_disp
atch
(
DispatchEx
*
dispex
,
IUnknown
*
outer
,
dispex_static_data_t
*
data
,
compat_mode_t
compat_mode
)
{
assert
(
compat_mode
<
COMPAT_MODE_CNT
);
...
...
dlls/mshtml/htmlattr.c
View file @
5590ea4a
...
...
@@ -512,7 +512,7 @@ HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dis
ret
->
dispid
=
dispid
;
ret
->
elem
=
elem
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLDOMAttribute_iface
,
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLDOMAttribute_iface
,
&
HTMLDOMAttribute_dispex
,
compat_mode
);
/* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */
...
...
dlls/mshtml/htmldoc.c
View file @
5590ea4a
...
...
@@ -5979,7 +5979,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
doc
->
basedoc
.
doc_obj
=
doc
;
init_disp
ex_with_compat_mode
(
&
doc
->
dispex
,
(
IUnknown
*
)
&
doc
->
ICustomDoc_iface
,
&
HTMLDocumentObj_dispex
,
COMPAT_MODE_QUIRKS
);
init_disp
atch
(
&
doc
->
dispex
,
(
IUnknown
*
)
&
doc
->
ICustomDoc_iface
,
&
HTMLDocumentObj_dispex
,
COMPAT_MODE_QUIRKS
);
init_doc
(
&
doc
->
basedoc
,
outer
?
outer
:
&
doc
->
IUnknown_inner
,
&
doc
->
dispex
.
IDispatchEx_iface
);
TargetContainer_Init
(
doc
);
doc
->
is_mhtml
=
is_mhtml
;
...
...
dlls/mshtml/htmlelem.c
View file @
5590ea4a
...
...
@@ -512,7 +512,7 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, compat_mode_t compat_m
rect
->
IHTMLRect_iface
.
lpVtbl
=
&
HTMLRectVtbl
;
rect
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
rect
->
dispex
,
(
IUnknown
*
)
&
rect
->
IHTMLRect_iface
,
&
HTMLRect_dispex
,
compat_mode
);
init_disp
atch
(
&
rect
->
dispex
,
(
IUnknown
*
)
&
rect
->
IHTMLRect_iface
,
&
HTMLRect_dispex
,
compat_mode
);
nsIDOMClientRect_AddRef
(
nsrect
);
rect
->
nsrect
=
nsrect
;
...
...
@@ -2668,7 +2668,7 @@ static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRec
rects
->
IHTMLRectCollection_iface
.
lpVtbl
=
&
HTMLRectCollectionVtbl
;
rects
->
ref
=
1
;
rects
->
rect_list
=
rect_list
;
init_disp
ex_with_compat_mode
(
&
rects
->
dispex
,
(
IUnknown
*
)
&
rects
->
IHTMLRectCollection_iface
,
init_disp
atch
(
&
rects
->
dispex
,
(
IUnknown
*
)
&
rects
->
IHTMLRectCollection_iface
,
&
HTMLRectCollection_dispex
,
dispex_compat_mode
(
&
This
->
node
.
event_target
.
dispex
));
*
pRectCol
=
&
rects
->
IHTMLRectCollection_iface
;
...
...
@@ -6614,7 +6614,7 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters
collection
->
IHTMLFiltersCollection_iface
.
lpVtbl
=
&
HTMLFiltersCollectionVtbl
;
collection
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLFiltersCollection_iface
,
init_disp
atch
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLFiltersCollection_iface
,
&
HTMLFiltersCollection_dispex
,
compat_mode
);
*
ret
=
&
collection
->
IHTMLFiltersCollection_iface
;
...
...
@@ -7198,7 +7198,7 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a
This
->
attrs
->
elem
=
This
;
list_init
(
&
This
->
attrs
->
attrs
);
init_disp
ex_with_compat_mode
(
&
This
->
attrs
->
dispex
,
(
IUnknown
*
)
&
This
->
attrs
->
IHTMLAttributeCollection_iface
,
init_disp
atch
(
&
This
->
attrs
->
dispex
,
(
IUnknown
*
)
&
This
->
attrs
->
IHTMLAttributeCollection_iface
,
&
HTMLAttributeCollection_dispex
,
dispex_compat_mode
(
&
iface
->
event_target
.
dispex
));
*
ac
=
This
->
attrs
;
...
...
dlls/mshtml/htmlelemcol.c
View file @
5590ea4a
...
...
@@ -833,7 +833,7 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems,
ret
->
elems
=
elems
;
ret
->
len
=
len
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLElementCollection_iface
,
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLElementCollection_iface
,
&
HTMLElementCollection_dispex
,
compat_mode
);
TRACE
(
"ret=%p len=%d
\n
"
,
ret
,
len
);
...
...
dlls/mshtml/htmlevent.c
View file @
5590ea4a
...
...
@@ -770,7 +770,7 @@ static HTMLEventObj *alloc_event_obj(DOMEvent *event, compat_mode_t compat_mode)
if
(
event
)
IDOMEvent_AddRef
(
&
event
->
IDOMEvent_iface
);
init_disp
ex_with_compat_mode
(
&
event_obj
->
dispex
,
(
IUnknown
*
)
&
event_obj
->
IHTMLEventObj_iface
,
&
HTMLEventObj_dispex
,
compat_mode
);
init_disp
atch
(
&
event_obj
->
dispex
,
(
IUnknown
*
)
&
event_obj
->
IHTMLEventObj_iface
,
&
HTMLEventObj_dispex
,
compat_mode
);
return
event_obj
;
}
...
...
@@ -2266,7 +2266,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev
else
event
->
keyboard_event
=
NULL
;
init_disp
ex_with_compat_mode
(
&
event
->
dispex
,
(
IUnknown
*
)
&
event
->
IDOMEvent_iface
,
dispex_data
,
compat_mode
);
init_disp
atch
(
&
event
->
dispex
,
(
IUnknown
*
)
&
event
->
IDOMEvent_iface
,
dispex_data
,
compat_mode
);
return
event
;
}
...
...
@@ -3429,7 +3429,7 @@ static int event_id_cmp(const void *key, const struct wine_rb_entry *entry)
void
EventTarget_Init
(
EventTarget
*
event_target
,
IUnknown
*
outer
,
dispex_static_data_t
*
dispex_data
,
compat_mode_t
compat_mode
)
{
init_disp
ex_with_compat_mode
(
&
event_target
->
dispex
,
outer
,
dispex_data
,
compat_mode
);
init_disp
atch
(
&
event_target
->
dispex
,
outer
,
dispex_data
,
compat_mode
);
event_target
->
IEventTarget_iface
.
lpVtbl
=
&
EventTargetVtbl
;
wine_rb_init
(
&
event_target
->
handler_map
,
event_id_cmp
);
}
...
...
dlls/mshtml/htmlimg.c
View file @
5590ea4a
...
...
@@ -992,7 +992,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElement
ret
->
ref
=
1
;
ret
->
window
=
window
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLImageElementFactory_iface
,
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLImageElementFactory_iface
,
&
HTMLImageElementFactory_dispex
,
dispex_compat_mode
(
&
window
->
event_target
.
dispex
));
*
ret_val
=
ret
;
...
...
dlls/mshtml/htmllocation.c
View file @
5590ea4a
...
...
@@ -649,7 +649,7 @@ HRESULT HTMLLocation_Create(HTMLInnerWindow *window, HTMLLocation **ret)
location
->
ref
=
1
;
location
->
window
=
window
;
init_disp
ex_with_compat_mode
(
&
location
->
dispex
,
(
IUnknown
*
)
&
location
->
IHTMLLocation_iface
,
&
HTMLLocation_dispex
,
init_disp
atch
(
&
location
->
dispex
,
(
IUnknown
*
)
&
location
->
IHTMLLocation_iface
,
&
HTMLLocation_dispex
,
dispex_compat_mode
(
&
window
->
event_target
.
dispex
));
*
ret
=
location
;
...
...
dlls/mshtml/htmlnode.c
View file @
5590ea4a
...
...
@@ -449,7 +449,7 @@ HRESULT create_child_collection(nsIDOMNodeList *nslist, compat_mode_t compat_mod
nsIDOMNodeList_AddRef
(
nslist
);
collection
->
nslist
=
nslist
;
init_disp
ex_with_compat_mode
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLDOMChildrenCollection_iface
,
init_disp
atch
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLDOMChildrenCollection_iface
,
&
HTMLDOMChildrenCollection_dispex
,
compat_mode
);
*
ret
=
&
collection
->
IHTMLDOMChildrenCollection_iface
;
...
...
dlls/mshtml/htmlselect.c
View file @
5590ea4a
...
...
@@ -614,7 +614,7 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionEleme
ret
->
ref
=
1
;
ret
->
window
=
window
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLOptionElementFactory_iface
,
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLOptionElementFactory_iface
,
&
HTMLOptionElementFactory_dispex
,
dispex_compat_mode
(
&
window
->
event_target
.
dispex
));
*
ret_ptr
=
ret
;
...
...
dlls/mshtml/htmlstorage.c
View file @
5590ea4a
...
...
@@ -207,7 +207,7 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p)
storage
->
IHTMLStorage_iface
.
lpVtbl
=
&
HTMLStorageVtbl
;
storage
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
storage
->
dispex
,
(
IUnknown
*
)
&
storage
->
IHTMLStorage_iface
,
&
HTMLStorage_dispex
,
compat_mode
);
init_disp
atch
(
&
storage
->
dispex
,
(
IUnknown
*
)
&
storage
->
IHTMLStorage_iface
,
&
HTMLStorage_dispex
,
compat_mode
);
*
p
=
&
storage
->
IHTMLStorage_iface
;
return
S_OK
;
...
...
dlls/mshtml/htmlstyle.c
View file @
5590ea4a
...
...
@@ -10061,7 +10061,7 @@ void init_css_style(CSSStyle *style, nsIDOMCSSStyleDeclaration *nsstyle, style_q
style
->
nsstyle
=
nsstyle
;
nsIDOMCSSStyleDeclaration_AddRef
(
nsstyle
);
init_disp
ex_with_compat_mode
(
&
style
->
dispex
,
(
IUnknown
*
)
&
style
->
IHTMLCSSStyleDeclaration_iface
,
init_disp
atch
(
&
style
->
dispex
,
(
IUnknown
*
)
&
style
->
IHTMLCSSStyleDeclaration_iface
,
dispex_info
,
compat_mode
);
}
...
...
dlls/mshtml/htmlstylesheet.c
View file @
5590ea4a
...
...
@@ -220,7 +220,7 @@ static HRESULT create_style_sheet_rule(nsIDOMCSSRule *nsstylesheetrule, compat_m
rule
->
ref
=
1
;
rule
->
nsstylesheetrule
=
NULL
;
init_disp
ex_with_compat_mode
(
&
rule
->
dispex
,
(
IUnknown
*
)
&
rule
->
IHTMLStyleSheetRule_iface
,
&
HTMLStyleSheetRule_dispex
,
init_disp
atch
(
&
rule
->
dispex
,
(
IUnknown
*
)
&
rule
->
IHTMLStyleSheetRule_iface
,
&
HTMLStyleSheetRule_dispex
,
compat_mode
);
if
(
nsstylesheetrule
)
...
...
@@ -393,7 +393,7 @@ static HRESULT create_style_sheet_rules_collection(nsIDOMCSSRuleList *nslist, co
collection
->
ref
=
1
;
collection
->
nslist
=
nslist
;
init_disp
ex_with_compat_mode
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLStyleSheetRulesCollection_iface
,
init_disp
atch
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLStyleSheetRulesCollection_iface
,
&
HTMLStyleSheetRulesCollection_dispex
,
compat_mode
);
if
(
nslist
)
...
...
@@ -595,7 +595,7 @@ HRESULT create_style_sheet_collection(nsIDOMStyleSheetList *nslist, compat_mode_
nsIDOMStyleSheetList_AddRef
(
nslist
);
collection
->
nslist
=
nslist
;
init_disp
ex_with_compat_mode
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLStyleSheetsCollection_iface
,
init_disp
atch
(
&
collection
->
dispex
,
(
IUnknown
*
)
&
collection
->
IHTMLStyleSheetsCollection_iface
,
&
HTMLStyleSheetsCollection_dispex
,
compat_mode
);
*
ret
=
&
collection
->
IHTMLStyleSheetsCollection_iface
;
...
...
@@ -969,7 +969,7 @@ HRESULT create_style_sheet(nsIDOMStyleSheet *nsstylesheet, compat_mode_t compat_
style_sheet
->
ref
=
1
;
style_sheet
->
nsstylesheet
=
NULL
;
init_disp
ex_with_compat_mode
(
&
style_sheet
->
dispex
,
(
IUnknown
*
)
&
style_sheet
->
IHTMLStyleSheet_iface
,
init_disp
atch
(
&
style_sheet
->
dispex
,
(
IUnknown
*
)
&
style_sheet
->
IHTMLStyleSheet_iface
,
&
HTMLStyleSheet_dispex
,
compat_mode
);
if
(
nsstylesheet
)
{
...
...
dlls/mshtml/mshtml_private.h
View file @
5590ea4a
...
...
@@ -365,7 +365,7 @@ extern void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjC
extern
void
(
__cdecl
*
describe_cc_node
)(
nsCycleCollectingAutoRefCnt
*
,
const
char
*
,
nsCycleCollectionTraversalCallback
*
)
DECLSPEC_HIDDEN
;
extern
void
(
__cdecl
*
note_cc_edge
)(
nsISupports
*
,
const
char
*
,
nsCycleCollectionTraversalCallback
*
)
DECLSPEC_HIDDEN
;
void
init_disp
ex_with_compat_mode
(
DispatchEx
*
,
IUnknown
*
,
dispex_static_data_t
*
,
compat_mode_t
)
DECLSPEC_HIDDEN
;
void
init_disp
atch
(
DispatchEx
*
,
IUnknown
*
,
dispex_static_data_t
*
,
compat_mode_t
)
DECLSPEC_HIDDEN
;
void
release_dispex
(
DispatchEx
*
)
DECLSPEC_HIDDEN
;
BOOL
dispex_query_interface
(
DispatchEx
*
,
REFIID
,
void
**
)
DECLSPEC_HIDDEN
;
HRESULT
dispex_get_dprop_ref
(
DispatchEx
*
,
const
WCHAR
*
,
BOOL
,
VARIANT
**
)
DECLSPEC_HIDDEN
;
...
...
@@ -380,11 +380,6 @@ const void *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN;
void
dispex_info_add_interface
(
dispex_data_t
*
,
tid_t
,
const
dispex_hook_t
*
)
DECLSPEC_HIDDEN
;
compat_mode_t
dispex_compat_mode
(
DispatchEx
*
)
DECLSPEC_HIDDEN
;
static
inline
void
init_dispex
(
DispatchEx
*
dispex
,
IUnknown
*
outer
,
dispex_static_data_t
*
desc
)
{
init_dispex_with_compat_mode
(
dispex
,
outer
,
desc
,
COMPAT_MODE_NONE
);
}
typedef
enum
{
DISPEXPROP_CUSTOM
,
DISPEXPROP_DYNAMIC
,
...
...
dlls/mshtml/omnavigator.c
View file @
5590ea4a
...
...
@@ -327,7 +327,7 @@ HRESULT create_dom_implementation(HTMLDocumentNode *doc_node, IHTMLDOMImplementa
dom_implementation
->
ref
=
1
;
dom_implementation
->
browser
=
doc_node
->
browser
;
init_disp
ex_with_compat_mode
(
&
dom_implementation
->
dispex
,
(
IUnknown
*
)
&
dom_implementation
->
IHTMLDOMImplementation_iface
,
init_disp
atch
(
&
dom_implementation
->
dispex
,
(
IUnknown
*
)
&
dom_implementation
->
IHTMLDOMImplementation_iface
,
&
HTMLDOMImplementation_dispex
,
doc_node
->
document_mode
);
nsres
=
nsIDOMHTMLDocument_GetImplementation
(
doc_node
->
nsdoc
,
&
dom_implementation
->
implementation
);
...
...
@@ -572,7 +572,7 @@ HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret)
screen
->
IHTMLScreen_iface
.
lpVtbl
=
&
HTMLSreenVtbl
;
screen
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
screen
->
dispex
,
(
IUnknown
*
)
&
screen
->
IHTMLScreen_iface
,
&
HTMLScreen_dispex
,
compat_mode
);
init_disp
atch
(
&
screen
->
dispex
,
(
IUnknown
*
)
&
screen
->
IHTMLScreen_iface
,
&
HTMLScreen_dispex
,
compat_mode
);
*
ret
=
&
screen
->
IHTMLScreen_iface
;
return
S_OK
;
...
...
@@ -733,7 +733,7 @@ HRESULT create_history(HTMLInnerWindow *window, OmHistory **ret)
if
(
!
history
)
return
E_OUTOFMEMORY
;
init_disp
ex_with_compat_mode
(
&
history
->
dispex
,
(
IUnknown
*
)
&
history
->
IOmHistory_iface
,
&
OmHistory_dispex
,
init_disp
atch
(
&
history
->
dispex
,
(
IUnknown
*
)
&
history
->
IOmHistory_iface
,
&
OmHistory_dispex
,
dispex_compat_mode
(
&
window
->
event_target
.
dispex
));
history
->
IOmHistory_iface
.
lpVtbl
=
&
OmHistoryVtbl
;
history
->
ref
=
1
;
...
...
@@ -892,7 +892,7 @@ static HRESULT create_plugins_collection(OmNavigator *navigator, HTMLPluginsColl
col
->
ref
=
1
;
col
->
navigator
=
navigator
;
init_disp
ex_with_compat_mode
(
&
col
->
dispex
,
(
IUnknown
*
)
&
col
->
IHTMLPluginsCollection_iface
,
init_disp
atch
(
&
col
->
dispex
,
(
IUnknown
*
)
&
col
->
IHTMLPluginsCollection_iface
,
&
HTMLPluginsCollection_dispex
,
dispex_compat_mode
(
&
navigator
->
dispex
));
*
ret
=
col
;
...
...
@@ -1036,7 +1036,7 @@ static HRESULT create_mime_types_collection(OmNavigator *navigator, HTMLMimeType
col
->
ref
=
1
;
col
->
navigator
=
navigator
;
init_disp
ex_with_compat_mode
(
&
col
->
dispex
,
(
IUnknown
*
)
&
col
->
IHTMLMimeTypesCollection_iface
,
init_disp
atch
(
&
col
->
dispex
,
(
IUnknown
*
)
&
col
->
IHTMLMimeTypesCollection_iface
,
&
HTMLMimeTypesCollection_dispex
,
dispex_compat_mode
(
&
navigator
->
dispex
));
*
ret
=
col
;
...
...
@@ -1464,7 +1464,7 @@ HRESULT create_navigator(compat_mode_t compat_mode, IOmNavigator **navigator)
ret
->
IOmNavigator_iface
.
lpVtbl
=
&
OmNavigatorVtbl
;
ret
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IOmNavigator_iface
,
&
OmNavigator_dispex
,
compat_mode
);
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IOmNavigator_iface
,
&
OmNavigator_dispex
,
compat_mode
);
*
navigator
=
&
ret
->
IOmNavigator_iface
;
return
S_OK
;
...
...
@@ -2099,7 +2099,7 @@ static HRESULT WINAPI HTMLPerformance_get_navigation(IHTMLPerformance *iface,
navigation
->
IHTMLPerformanceNavigation_iface
.
lpVtbl
=
&
HTMLPerformanceNavigationVtbl
;
navigation
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
navigation
->
dispex
,
(
IUnknown
*
)
&
navigation
->
IHTMLPerformanceNavigation_iface
,
init_disp
atch
(
&
navigation
->
dispex
,
(
IUnknown
*
)
&
navigation
->
IHTMLPerformanceNavigation_iface
,
&
HTMLPerformanceNavigation_dispex
,
dispex_compat_mode
(
&
This
->
dispex
));
This
->
navigation
=
&
navigation
->
IHTMLPerformanceNavigation_iface
;
...
...
@@ -2124,7 +2124,7 @@ static HRESULT WINAPI HTMLPerformance_get_timing(IHTMLPerformance *iface, IHTMLP
timing
->
IHTMLPerformanceTiming_iface
.
lpVtbl
=
&
HTMLPerformanceTimingVtbl
;
timing
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
timing
->
dispex
,
(
IUnknown
*
)
&
timing
->
IHTMLPerformanceTiming_iface
,
init_disp
atch
(
&
timing
->
dispex
,
(
IUnknown
*
)
&
timing
->
IHTMLPerformanceTiming_iface
,
&
HTMLPerformanceTiming_dispex
,
dispex_compat_mode
(
&
This
->
dispex
));
This
->
timing
=
&
timing
->
IHTMLPerformanceTiming_iface
;
...
...
@@ -2183,7 +2183,7 @@ HRESULT create_performance(compat_mode_t compat_mode, IHTMLPerformance **ret)
performance
->
IHTMLPerformance_iface
.
lpVtbl
=
&
HTMLPerformanceVtbl
;
performance
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
performance
->
dispex
,
(
IUnknown
*
)
&
performance
->
IHTMLPerformance_iface
,
init_disp
atch
(
&
performance
->
dispex
,
(
IUnknown
*
)
&
performance
->
IHTMLPerformance_iface
,
&
HTMLPerformance_dispex
,
compat_mode
);
*
ret
=
&
performance
->
IHTMLPerformance_iface
;
...
...
@@ -2339,7 +2339,7 @@ HRESULT create_namespace_collection(compat_mode_t compat_mode, IHTMLNamespaceCol
namespaces
->
IHTMLNamespaceCollection_iface
.
lpVtbl
=
&
HTMLNamespaceCollectionVtbl
;
namespaces
->
ref
=
1
;
init_disp
ex_with_compat_mode
(
&
namespaces
->
dispex
,
(
IUnknown
*
)
&
namespaces
->
IHTMLNamespaceCollection_iface
,
init_disp
atch
(
&
namespaces
->
dispex
,
(
IUnknown
*
)
&
namespaces
->
IHTMLNamespaceCollection_iface
,
&
HTMLNamespaceCollection_dispex
,
compat_mode
);
*
ret
=
&
namespaces
->
IHTMLNamespaceCollection_iface
;
return
S_OK
;
...
...
dlls/mshtml/range.c
View file @
5590ea4a
...
...
@@ -1729,7 +1729,7 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx
if
(
!
ret
)
return
E_OUTOFMEMORY
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLTxtRange_iface
,
&
HTMLTxtRange_dispex
,
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLTxtRange_iface
,
&
HTMLTxtRange_dispex
,
dispex_compat_mode
(
&
doc
->
node
.
event_target
.
dispex
));
ret
->
IHTMLTxtRange_iface
.
lpVtbl
=
&
HTMLTxtRangeVtbl
;
...
...
@@ -2074,7 +2074,7 @@ HRESULT create_dom_range(nsIDOMRange *nsrange, compat_mode_t compat_mode, IHTMLD
if
(
!
ret
)
return
E_OUTOFMEMORY
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLDOMRange_iface
,
&
HTMLDOMRange_dispex
,
compat_mode
);
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLDOMRange_iface
,
&
HTMLDOMRange_dispex
,
compat_mode
);
ret
->
IHTMLDOMRange_iface
.
lpVtbl
=
&
HTMLDOMRangeVtbl
;
ret
->
ref
=
1
;
...
...
dlls/mshtml/selection.c
View file @
5590ea4a
...
...
@@ -343,7 +343,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect
if
(
!
selection
)
return
E_OUTOFMEMORY
;
init_disp
ex_with_compat_mode
(
&
selection
->
dispex
,
(
IUnknown
*
)
&
selection
->
IHTMLSelectionObject_iface
,
init_disp
atch
(
&
selection
->
dispex
,
(
IUnknown
*
)
&
selection
->
IHTMLSelectionObject_iface
,
&
HTMLSelectionObject_dispex
,
dispex_compat_mode
(
&
doc
->
node
.
event_target
.
dispex
));
selection
->
IHTMLSelectionObject_iface
.
lpVtbl
=
&
HTMLSelectionObjectVtbl
;
...
...
dlls/mshtml/xmlhttprequest.c
View file @
5590ea4a
...
...
@@ -1084,7 +1084,7 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow* window, HTMLXMLHttpReq
ret
->
ref
=
1
;
ret
->
window
=
window
;
init_disp
ex_with_compat_mode
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLXMLHttpRequestFactory_iface
,
init_disp
atch
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLXMLHttpRequestFactory_iface
,
&
HTMLXMLHttpRequestFactory_dispex
,
dispex_compat_mode
(
&
window
->
event_target
.
dispex
));
*
ret_ptr
=
ret
;
...
...
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