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
120bf0eb
Commit
120bf0eb
authored
Mar 14, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2a6cb251
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
8 deletions
+1
-8
htmldoc.c
dlls/mshtml/htmldoc.c
+1
-5
htmlwindow.c
dlls/mshtml/htmlwindow.c
+0
-2
mshtml_private.h
dlls/mshtml/mshtml_private.h
+0
-1
No files found.
dlls/mshtml/htmldoc.c
View file @
120bf0eb
...
...
@@ -5321,10 +5321,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface)
This
->
basedoc
.
doc_node
->
basedoc
.
doc_obj
=
NULL
;
htmldoc_release
(
&
This
->
basedoc
.
doc_node
->
basedoc
);
}
if
(
This
->
basedoc
.
window
)
{
This
->
basedoc
.
window
->
doc_obj
=
NULL
;
if
(
This
->
basedoc
.
window
)
IHTMLWindow2_Release
(
&
This
->
basedoc
.
window
->
base
.
IHTMLWindow2_iface
);
}
if
(
This
->
advise_holder
)
IOleAdviseHolder_Release
(
This
->
advise_holder
);
...
...
@@ -5498,8 +5496,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
doc
->
basedoc
.
window
=
doc
->
nscontainer
->
content_window
;
IHTMLWindow2_AddRef
(
&
doc
->
basedoc
.
window
->
base
.
IHTMLWindow2_iface
);
doc
->
basedoc
.
window
->
doc_obj
=
doc
;
if
(
!
doc
->
basedoc
.
doc_node
&&
doc
->
basedoc
.
window
->
base
.
inner_window
->
doc
)
{
doc
->
basedoc
.
doc_node
=
doc
->
basedoc
.
window
->
base
.
inner_window
->
doc
;
htmldoc_addref
(
&
doc
->
basedoc
.
doc_node
->
basedoc
);
...
...
dlls/mshtml/htmlwindow.c
View file @
120bf0eb
...
...
@@ -3567,8 +3567,6 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow
window
->
base
.
outer_window
=
window
;
window
->
base
.
inner_window
=
NULL
;
window
->
doc_obj
=
browser
->
doc
;
window
->
browser
=
browser
;
list_add_head
(
&
browser
->
outer_windows
,
&
window
->
browser_entry
);
...
...
dlls/mshtml/mshtml_private.h
View file @
120bf0eb
...
...
@@ -475,7 +475,6 @@ struct HTMLOuterWindow {
LONG
task_magic
;
HTMLDocumentObj
*
doc_obj
;
nsIDOMWindow
*
nswindow
;
mozIDOMWindowProxy
*
window_proxy
;
HTMLOuterWindow
*
parent
;
...
...
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