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
a46e0c61
Commit
a46e0c61
authored
Feb 26, 2011
by
Thomas Mullaly
Committed by
Alexandre Julliard
Mar 08, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Correctly forward IHTMLWindow's IHTMLDocument's ConnectionPointContainer.
parent
1571097e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
conpoint.c
dlls/mshtml/conpoint.c
+1
-1
htmlwindow.c
dlls/mshtml/htmlwindow.c
+3
-1
events.c
dlls/mshtml/tests/events.c
+1
-1
No files found.
dlls/mshtml/conpoint.c
View file @
a46e0c61
...
...
@@ -266,7 +266,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo
TRACE
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_cp_guid
(
riid
),
ppCP
);
if
(
This
->
forward_container
)
return
IConnectionPointContainer_FindConnectionPoint
(
&
This
->
IConnectionPointContainer_iface
,
return
IConnectionPointContainer_FindConnectionPoint
(
&
This
->
forward_container
->
IConnectionPointContainer_iface
,
riid
,
ppCP
);
*
ppCP
=
NULL
;
...
...
dlls/mshtml/htmlwindow.c
View file @
a46e0c61
...
...
@@ -40,6 +40,8 @@ static struct list window_list = LIST_INIT(window_list);
static
void
window_set_docnode
(
HTMLWindow
*
window
,
HTMLDocumentNode
*
doc_node
)
{
if
(
window
->
doc
)
{
if
(
window
->
doc_obj
&&
window
==
window
->
doc_obj
->
basedoc
.
window
)
window
->
doc
->
basedoc
.
cp_container
.
forward_container
=
NULL
;
abort_document_bindings
(
window
->
doc
);
window
->
doc
->
basedoc
.
window
=
NULL
;
htmldoc_release
(
&
window
->
doc
->
basedoc
);
...
...
@@ -2245,6 +2247,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML
list_init
(
&
window
->
script_hosts
);
window
->
task_magic
=
get_task_target_magic
();
*
ret
=
window
;
update_window_doc
(
window
);
list_init
(
&
window
->
children
);
...
...
@@ -2257,7 +2260,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML
list_add_tail
(
&
parent
->
children
,
&
window
->
sibling_entry
);
}
*
ret
=
window
;
return
S_OK
;
}
...
...
dlls/mshtml/tests/events.c
View file @
a46e0c61
...
...
@@ -2407,7 +2407,7 @@ static void test_empty_document(void)
cp
=
get_cp
((
IUnknown
*
)
doc
,
&
IID_IDispatch
);
hres
=
IConnectionPoint_Unadvise
(
cp
,
cookie
);
IConnectionPoint_Release
(
cp
);
todo_wine
ok
(
hres
==
S_OK
,
"Unadvise failed: %08x
\n
"
,
hres
);
ok
(
hres
==
S_OK
,
"Unadvise failed: %08x
\n
"
,
hres
);
IHTMLDocument2_Release
(
windows_doc
);
}
...
...
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