Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
d1c1f9e8
Commit
d1c1f9e8
authored
Oct 17, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 17, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use detach_inner_window in release_inner_window.
parent
75994335
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
14 deletions
+17
-14
htmlevent.c
dlls/mshtml/htmlevent.c
+3
-1
htmlwindow.c
dlls/mshtml/htmlwindow.c
+14
-13
No files found.
dlls/mshtml/htmlevent.c
View file @
d1c1f9e8
...
...
@@ -1312,8 +1312,10 @@ void detach_events(HTMLDocumentNode *doc)
int
i
;
for
(
i
=
0
;
i
<
EVENTID_LAST
;
i
++
)
{
if
(
doc
->
event_vector
[
i
])
if
(
doc
->
event_vector
[
i
])
{
detach_nsevent
(
doc
,
event_info
[
i
].
name
);
doc
->
event_vector
[
i
]
=
FALSE
;
}
}
}
...
...
dlls/mshtml/htmlwindow.c
View file @
d1c1f9e8
...
...
@@ -106,23 +106,23 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN
return
get_event_handler
(
&
window
->
inner_window
->
doc
->
body_event_target
,
eid
,
var
);
}
static
void
detach_inner_window
(
HTML
OuterWindow
*
outer_
window
)
static
void
detach_inner_window
(
HTML
InnerWindow
*
window
)
{
HTMLInnerWindow
*
window
=
outer_window
->
base
.
inner_window
;
if
(
!
window
)
return
;
HTMLOuterWindow
*
outer_window
=
window
->
base
.
outer_window
;
if
(
outer_window
->
doc_obj
&&
outer_window
==
outer_window
->
doc_obj
->
basedoc
.
window
)
if
(
outer_window
&&
outer_window
->
doc_obj
&&
outer_window
==
outer_window
->
doc_obj
->
basedoc
.
window
)
window
->
doc
->
basedoc
.
cp_container
.
forward_container
=
NULL
;
detach_events
(
window
->
doc
);
if
(
window
->
doc
)
detach_events
(
window
->
doc
);
abort_window_bindings
(
window
);
release_script_hosts
(
window
);
window
->
doc
->
basedoc
.
window
=
NULL
;
window
->
base
.
outer_window
=
NULL
;
IHTMLWindow2_Release
(
&
window
->
base
.
IHTMLWindow2_iface
);
if
(
outer_window
&&
outer_window
->
base
.
inner_window
==
window
)
{
outer_window
->
base
.
inner_window
=
NULL
;
IHTMLWindow2_Release
(
&
window
->
base
.
IHTMLWindow2_iface
);
}
}
static
inline
HTMLWindow
*
impl_from_IHTMLWindow2
(
IHTMLWindow2
*
iface
)
...
...
@@ -206,7 +206,8 @@ static void release_outer_window(HTMLOuterWindow *This)
remove_target_tasks
(
This
->
task_magic
);
set_current_mon
(
This
,
NULL
);
detach_inner_window
(
This
);
if
(
This
->
base
.
inner_window
)
detach_inner_window
(
This
->
base
.
inner_window
);
release_children
(
This
);
if
(
This
->
secmgr
)
...
...
@@ -231,9 +232,8 @@ static void release_inner_window(HTMLInnerWindow *This)
TRACE
(
"%p
\n
"
,
This
);
detach_inner_window
(
This
);
remove_target_tasks
(
This
->
task_magic
);
abort_window_bindings
(
This
);
release_script_hosts
(
This
);
if
(
This
->
doc
)
{
This
->
doc
->
window
=
NULL
;
...
...
@@ -2877,7 +2877,8 @@ HRESULT update_window_doc(HTMLInnerWindow *window)
return
S_OK
;
}
detach_inner_window
(
outer_window
);
if
(
outer_window
->
base
.
inner_window
)
detach_inner_window
(
outer_window
->
base
.
inner_window
);
outer_window
->
base
.
inner_window
=
window
;
outer_window
->
pending_window
=
NULL
;
...
...
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