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
b85631ba
Commit
b85631ba
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 image_factory to HTMLInnerWindow.
parent
b7f74922
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
13 deletions
+21
-13
htmlimg.c
dlls/mshtml/htmlimg.c
+5
-2
htmlwindow.c
dlls/mshtml/htmlwindow.c
+13
-8
mshtml_private.h
dlls/mshtml/mshtml_private.h
+3
-3
No files found.
dlls/mshtml/htmlimg.c
View file @
b85631ba
...
...
@@ -920,11 +920,13 @@ static dispex_static_data_t HTMLImageElementFactory_dispex = {
HTMLImageElementFactory_iface_tids
};
H
TMLImageElementFactory
*
HTMLImageElementFactory_Create
(
HTMLOuterWindow
*
window
)
H
RESULT
HTMLImageElementFactory_Create
(
HTMLInnerWindow
*
window
,
HTMLImageElementFactory
**
ret_val
)
{
HTMLImageElementFactory
*
ret
;
ret
=
heap_alloc
(
sizeof
(
HTMLImageElementFactory
));
if
(
!
ret
)
return
E_OUTOFMEMORY
;
ret
->
IHTMLImageElementFactory_iface
.
lpVtbl
=
&
HTMLImageElementFactoryVtbl
;
ret
->
ref
=
1
;
...
...
@@ -933,5 +935,6 @@ HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow *window)
init_dispex
(
&
ret
->
dispex
,
(
IUnknown
*
)
&
ret
->
IHTMLImageElementFactory_iface
,
&
HTMLImageElementFactory_dispex
);
return
ret
;
*
ret_val
=
ret
;
return
S_OK
;
}
dlls/mshtml/htmlwindow.c
View file @
b85631ba
...
...
@@ -192,11 +192,6 @@ static void release_outer_window(HTMLOuterWindow *This)
if
(
This
->
frame_element
)
This
->
frame_element
->
content_window
=
NULL
;
if
(
This
->
image_factory
)
{
This
->
image_factory
->
window
=
NULL
;
IHTMLImageElementFactory_Release
(
&
This
->
image_factory
->
IHTMLImageElementFactory_iface
);
}
if
(
This
->
location
)
{
This
->
location
->
window
=
NULL
;
IHTMLLocation_Release
(
&
This
->
location
->
IHTMLLocation_iface
);
...
...
@@ -228,6 +223,11 @@ static void release_inner_window(HTMLInnerWindow *This)
heap_free
(
This
->
global_props
[
i
].
name
);
heap_free
(
This
->
global_props
);
if
(
This
->
image_factory
)
{
This
->
image_factory
->
window
=
NULL
;
IHTMLImageElementFactory_Release
(
&
This
->
image_factory
->
IHTMLImageElementFactory_iface
);
}
if
(
This
->
option_factory
)
{
This
->
option_factory
->
window
=
NULL
;
IHTMLOptionElementFactory_Release
(
&
This
->
option_factory
->
IHTMLOptionElementFactory_iface
);
...
...
@@ -647,12 +647,17 @@ static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message,
static
HRESULT
WINAPI
HTMLWindow2_get_Image
(
IHTMLWindow2
*
iface
,
IHTMLImageElementFactory
**
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
);
if
(
!
window
->
image_factory
)
window
->
image_factory
=
HTMLImageElementFactory_Create
(
window
);
if
(
!
window
->
image_factory
)
{
HRESULT
hres
;
hres
=
HTMLImageElementFactory_Create
(
window
,
&
window
->
image_factory
);
if
(
FAILED
(
hres
))
return
hres
;
}
*
p
=
&
window
->
image_factory
->
IHTMLImageElementFactory_iface
;
IHTMLImageElementFactory_AddRef
(
*
p
);
...
...
dlls/mshtml/mshtml_private.h
View file @
b85631ba
...
...
@@ -278,7 +278,7 @@ typedef struct {
LONG
ref
;
HTML
Out
erWindow
*
window
;
HTML
Inn
erWindow
*
window
;
}
HTMLImageElementFactory
;
struct
HTMLLocation
{
...
...
@@ -335,7 +335,6 @@ struct HTMLOuterWindow {
IInternetSecurityManager
*
secmgr
;
HTMLImageElementFactory
*
image_factory
;
HTMLLocation
*
location
;
IHTMLScreen
*
screen
;
IOmHistory
*
history
;
...
...
@@ -355,6 +354,7 @@ struct HTMLInnerWindow {
IHTMLEventObj
*
event
;
HTMLImageElementFactory
*
image_factory
;
HTMLOptionElementFactory
*
option_factory
;
global_prop_t
*
global_props
;
...
...
@@ -663,7 +663,7 @@ HRESULT update_window_doc(HTMLOuterWindow*) DECLSPEC_HIDDEN;
HTMLOuterWindow
*
nswindow_to_window
(
const
nsIDOMWindow
*
)
DECLSPEC_HIDDEN
;
void
get_top_window
(
HTMLOuterWindow
*
,
HTMLOuterWindow
**
)
DECLSPEC_HIDDEN
;
HRESULT
HTMLOptionElementFactory_Create
(
HTMLInnerWindow
*
,
HTMLOptionElementFactory
**
)
DECLSPEC_HIDDEN
;
H
TMLImageElementFactory
*
HTMLImageElementFactory_Create
(
HTMLOuterWindow
*
)
DECLSPEC_HIDDEN
;
H
RESULT
HTMLImageElementFactory_Create
(
HTMLInnerWindow
*
,
HTMLImageElementFactory
*
*
)
DECLSPEC_HIDDEN
;
HRESULT
HTMLLocation_Create
(
HTMLOuterWindow
*
,
HTMLLocation
**
)
DECLSPEC_HIDDEN
;
IOmNavigator
*
OmNavigator_Create
(
void
)
DECLSPEC_HIDDEN
;
HRESULT
HTMLScreen_Create
(
IHTMLScreen
**
)
DECLSPEC_HIDDEN
;
...
...
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