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
6938378b
Commit
6938378b
authored
Mar 03, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 03, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLPrivateWindow stub implementation.
parent
73a58137
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
88 additions
and
1 deletion
+88
-1
htmlwindow.c
dlls/mshtml/htmlwindow.c
+87
-1
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-0
No files found.
dlls/mshtml/htmlwindow.c
View file @
6938378b
...
...
@@ -27,7 +27,6 @@
#include "mshtmdid.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "mshtml_private.h"
#include "htmlevent.h"
...
...
@@ -35,6 +34,8 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
mshtml
);
#define HTMLPRIVWINDOW(x) ((IHTMLPrivateWindow*) &(x)->lpIHTMLPrivateWindowVtbl)
static
struct
list
window_list
=
LIST_INIT
(
window_list
);
static
void
window_set_docnode
(
HTMLWindow
*
window
,
HTMLDocumentNode
*
doc_node
)
...
...
@@ -166,6 +167,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii
}
else
if
(
IsEqualGUID
(
&
IID_IHTMLWindow4
,
riid
))
{
TRACE
(
"(%p)->(IID_IHTMLWindow4 %p)
\n
"
,
This
,
ppv
);
*
ppv
=
HTMLWINDOW4
(
This
);
}
else
if
(
IsEqualGUID
(
&
IID_IHTMLPrivateWindow
,
riid
))
{
TRACE
(
"(%p)->(IID_IHTMLPrivateWindow %p)
\n
"
,
This
,
ppv
);
*
ppv
=
HTMLPRIVWINDOW
(
This
);
}
else
if
(
dispex_query_interface
(
&
This
->
dispex
,
riid
,
ppv
))
{
return
*
ppv
?
S_OK
:
E_NOINTERFACE
;
}
...
...
@@ -1641,6 +1645,87 @@ static const IHTMLWindow4Vtbl HTMLWindow4Vtbl = {
HTMLWindow4_get_frameElement
};
#define HTMLPRIVWINDOW_THIS(iface) DEFINE_THIS(HTMLWindow, IHTMLPrivateWindow, iface)
static
HRESULT
WINAPI
HTMLPrivateWindow_QueryInterface
(
IHTMLPrivateWindow
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
return
IHTMLWindow2_QueryInterface
(
HTMLWINDOW2
(
This
),
riid
,
ppv
);
}
static
ULONG
WINAPI
HTMLPrivateWindow_AddRef
(
IHTMLPrivateWindow
*
iface
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
return
IHTMLWindow2_AddRef
(
HTMLWINDOW2
(
This
));
}
static
ULONG
WINAPI
HTMLPrivateWindow_Release
(
IHTMLPrivateWindow
*
iface
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
return
IHTMLWindow2_Release
(
HTMLWINDOW2
(
This
));
}
static
HRESULT
WINAPI
HTMLPrivateWindow_SuperNavigate
(
IHTMLPrivateWindow
*
iface
,
BSTR
url
,
BSTR
arg2
,
BSTR
arg3
,
BSTR
arg4
,
VARIANT
*
post_data_var
,
VARIANT
*
headers_var
,
ULONG
flags
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
FIXME
(
"(%p)->(%s %s %s %s %s %s %x)
\n
"
,
This
,
debugstr_w
(
url
),
debugstr_w
(
arg2
),
debugstr_w
(
arg3
),
debugstr_w
(
arg4
),
debugstr_variant
(
post_data_var
),
debugstr_variant
(
headers_var
),
flags
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLPrivateWindow_GetPendingUrl
(
IHTMLPrivateWindow
*
iface
,
BSTR
*
url
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
url
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLPrivateWindow_SetPICSTarget
(
IHTMLPrivateWindow
*
iface
,
IOleCommandTarget
*
cmdtrg
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
cmdtrg
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLPrivateWindow_PICSComplete
(
IHTMLPrivateWindow
*
iface
,
int
arg
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
FIXME
(
"(%p)->(%x)
\n
"
,
This
,
arg
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLPrivateWindow_FindWindowByName
(
IHTMLPrivateWindow
*
iface
,
LPCWSTR
name
,
IHTMLWindow2
**
ret
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
FIXME
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_w
(
name
),
ret
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLPrivateWindow_GetAddressBar
(
IHTMLPrivateWindow
*
iface
,
BSTR
*
url
)
{
HTMLWindow
*
This
=
HTMLPRIVWINDOW_THIS
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
url
);
return
E_NOTIMPL
;
}
#undef HTMLPRIVWINDOW_THIS
static
const
IHTMLPrivateWindowVtbl
HTMLPrivateWindowVtbl
=
{
HTMLPrivateWindow_QueryInterface
,
HTMLPrivateWindow_AddRef
,
HTMLPrivateWindow_Release
,
HTMLPrivateWindow_SuperNavigate
,
HTMLPrivateWindow_GetPendingUrl
,
HTMLPrivateWindow_SetPICSTarget
,
HTMLPrivateWindow_PICSComplete
,
HTMLPrivateWindow_FindWindowByName
,
HTMLPrivateWindow_GetAddressBar
};
#define DISPEX_THIS(iface) DEFINE_THIS(HTMLWindow, IDispatchEx, iface)
static
HRESULT
WINAPI
WindowDispEx_QueryInterface
(
IDispatchEx
*
iface
,
REFIID
riid
,
void
**
ppv
)
...
...
@@ -1954,6 +2039,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML
window
->
lpHTMLWindow2Vtbl
=
&
HTMLWindow2Vtbl
;
window
->
lpHTMLWindow3Vtbl
=
&
HTMLWindow3Vtbl
;
window
->
lpHTMLWindow4Vtbl
=
&
HTMLWindow4Vtbl
;
window
->
lpIHTMLPrivateWindowVtbl
=
&
HTMLPrivateWindowVtbl
;
window
->
lpIDispatchExVtbl
=
&
WindowDispExVtbl
;
window
->
ref
=
1
;
window
->
doc_obj
=
doc_obj
;
...
...
dlls/mshtml/mshtml_private.h
View file @
6938378b
...
...
@@ -235,6 +235,7 @@ struct HTMLWindow {
const
IHTMLWindow2Vtbl
*
lpHTMLWindow2Vtbl
;
const
IHTMLWindow3Vtbl
*
lpHTMLWindow3Vtbl
;
const
IHTMLWindow4Vtbl
*
lpHTMLWindow4Vtbl
;
const
IHTMLPrivateWindowVtbl
*
lpIHTMLPrivateWindowVtbl
;
const
IDispatchExVtbl
*
lpIDispatchExVtbl
;
LONG
ref
;
...
...
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