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
676d4af4
Commit
676d4af4
authored
Oct 10, 2008
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 13, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Move GetContentDOMWindow call from HTMLWindow_Create.
parent
b5aa4dd8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
17 deletions
+25
-17
htmldoc.c
dlls/mshtml/htmldoc.c
+7
-1
htmlwindow.c
dlls/mshtml/htmlwindow.c
+17
-15
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-1
No files found.
dlls/mshtml/htmldoc.c
View file @
676d4af4
...
...
@@ -1551,6 +1551,7 @@ static dispex_static_data_t HTMLDocument_dispex = {
HRESULT
HTMLDocument_Create
(
IUnknown
*
pUnkOuter
,
REFIID
riid
,
void
**
ppvObject
)
{
nsIDOMWindow
*
nswindow
;
HTMLDocument
*
ret
;
HRESULT
hres
;
...
...
@@ -1596,7 +1597,12 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject)
ret
->
nscontainer
=
NSContainer_Create
(
ret
,
NULL
);
update_nsdocument
(
ret
);
ret
->
window
=
HTMLWindow_Create
(
ret
);
if
(
ret
->
nscontainer
)
nsIWebBrowser_GetContentDOMWindow
(
ret
->
nscontainer
->
webbrowser
,
&
nswindow
);
HTMLWindow_Create
(
ret
,
nswindow
,
&
ret
->
window
);
if
(
nswindow
)
nsIDOMWindow_Release
(
nswindow
);
get_thread_hwnd
();
...
...
dlls/mshtml/htmlwindow.c
View file @
676d4af4
...
...
@@ -1182,29 +1182,31 @@ static dispex_static_data_t HTMLWindow_dispex = {
HTMLWindow_iface_tids
};
H
TMLWindow
*
HTMLWindow_Create
(
HTMLDocument
*
doc
)
H
RESULT
HTMLWindow_Create
(
HTMLDocument
*
doc
,
nsIDOMWindow
*
nswindow
,
HTMLWindow
**
ret
)
{
HTMLWindow
*
ret
=
heap_alloc_zero
(
sizeof
(
HTMLWindow
))
;
HTMLWindow
*
window
;
ret
->
lpHTMLWindow2Vtbl
=
&
HTMLWindow2Vtbl
;
ret
->
lpHTMLWindow3Vtbl
=
&
HTMLWindow3Vtbl
;
ret
->
lpIDispatchExVtbl
=
&
WindowDispExVtbl
;
ret
->
ref
=
1
;
ret
->
doc
=
doc
;
window
=
heap_alloc_zero
(
sizeof
(
HTMLWindow
));
if
(
!
window
)
return
E_OUTOFMEMORY
;
init_dispex
(
&
ret
->
dispex
,
(
IUnknown
*
)
HTMLWINDOW2
(
ret
),
&
HTMLWindow_dispex
);
window
->
lpHTMLWindow2Vtbl
=
&
HTMLWindow2Vtbl
;
window
->
lpHTMLWindow3Vtbl
=
&
HTMLWindow3Vtbl
;
window
->
lpIDispatchExVtbl
=
&
WindowDispExVtbl
;
window
->
ref
=
1
;
window
->
doc
=
doc
;
if
(
doc
->
nscontainer
)
{
nsresult
nsres
;
init_dispex
(
&
window
->
dispex
,
(
IUnknown
*
)
HTMLWINDOW2
(
window
),
&
HTMLWindow_dispex
);
nsres
=
nsIWebBrowser_GetContentDOMWindow
(
doc
->
nscontainer
->
webbrowser
,
&
ret
->
nswindow
);
if
(
NS_FAILED
(
nsres
))
ERR
(
"GetContentDOMWindow failed: %08x
\n
"
,
nsres
)
;
if
(
nswindow
)
{
nsIDOMWindow_AddRef
(
nswindow
);
window
->
nswindow
=
nswindow
;
}
list_add_head
(
&
window_list
,
&
ret
->
entry
);
list_add_head
(
&
window_list
,
&
window
->
entry
);
return
ret
;
*
ret
=
window
;
return
S_OK
;
}
HTMLWindow
*
nswindow_to_window
(
const
nsIDOMWindow
*
nswindow
)
...
...
dlls/mshtml/mshtml_private.h
View file @
676d4af4
...
...
@@ -460,7 +460,7 @@ typedef struct {
HRESULT
HTMLDocument_Create
(
IUnknown
*
,
REFIID
,
void
**
);
HRESULT
HTMLLoadOptions_Create
(
IUnknown
*
,
REFIID
,
void
**
);
H
TMLWindow
*
HTMLWindow_Create
(
HTMLDocument
*
);
H
RESULT
HTMLWindow_Create
(
HTMLDocument
*
,
nsIDOMWindow
*
,
HTMLWindow
*
*
);
HTMLWindow
*
nswindow_to_window
(
const
nsIDOMWindow
*
);
HTMLOptionElementFactory
*
HTMLOptionElementFactory_Create
(
HTMLDocument
*
);
HTMLLocation
*
HTMLLocation_Create
(
HTMLDocument
*
);
...
...
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