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
4647fe0f
Commit
4647fe0f
authored
Jun 26, 2012
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 26, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Moved screen property to HTMLInnerWindow.
parent
b85631ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
htmlwindow.c
dlls/mshtml/htmlwindow.c
+4
-4
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-1
No files found.
dlls/mshtml/htmlwindow.c
View file @
4647fe0f
...
...
@@ -197,9 +197,6 @@ static void release_outer_window(HTMLOuterWindow *This)
IHTMLLocation_Release
(
&
This
->
location
->
IHTMLLocation_iface
);
}
if
(
This
->
screen
)
IHTMLScreen_Release
(
This
->
screen
);
This
->
window_ref
->
window
=
NULL
;
windowref_release
(
This
->
window_ref
);
...
...
@@ -233,6 +230,9 @@ static void release_inner_window(HTMLInnerWindow *This)
IHTMLOptionElementFactory_Release
(
&
This
->
option_factory
->
IHTMLOptionElementFactory_iface
);
}
if
(
This
->
screen
)
IHTMLScreen_Release
(
This
->
screen
);
heap_free
(
This
);
}
...
...
@@ -1068,7 +1068,7 @@ static HRESULT WINAPI HTMLWindow2_showHelp(IHTMLWindow2 *iface, BSTR helpURL, VA
static
HRESULT
WINAPI
HTMLWindow2_get_screen
(
IHTMLWindow2
*
iface
,
IHTMLScreen
**
p
)
{
HTMLWindow
*
This
=
impl_from_IHTMLWindow2
(
iface
);
HTML
OuterWindow
*
window
=
This
->
out
er_window
;
HTML
InnerWindow
*
window
=
This
->
inn
er_window
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
...
...
dlls/mshtml/mshtml_private.h
View file @
4647fe0f
...
...
@@ -336,7 +336,6 @@ struct HTMLOuterWindow {
IInternetSecurityManager
*
secmgr
;
HTMLLocation
*
location
;
IHTMLScreen
*
screen
;
IOmHistory
*
history
;
struct
list
children
;
...
...
@@ -356,6 +355,7 @@ struct HTMLInnerWindow {
HTMLImageElementFactory
*
image_factory
;
HTMLOptionElementFactory
*
option_factory
;
IHTMLScreen
*
screen
;
global_prop_t
*
global_props
;
DWORD
global_prop_cnt
;
...
...
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