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
9141c97d
Commit
9141c97d
authored
Apr 13, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Silence failing QueryInterfaces common for .net applications.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
38436fff
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
dispex.c
dlls/mshtml/dispex.c
+5
-0
htmldoc.c
dlls/mshtml/htmldoc.c
+0
-3
htmllocation.c
dlls/mshtml/htmllocation.c
+4
-0
htmlwindow.c
dlls/mshtml/htmlwindow.c
+4
-0
main.c
dlls/mshtml/main.c
+3
-0
No files found.
dlls/mshtml/dispex.c
View file @
9141c97d
...
...
@@ -26,6 +26,7 @@
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "mscoree.h"
#include "wine/debug.h"
...
...
@@ -1675,6 +1676,10 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv)
*
ppv
=
NULL
;
else
if
(
IsEqualGUID
(
&
IID_UndocumentedScriptIface
,
riid
))
*
ppv
=
NULL
;
else
if
(
IsEqualGUID
(
&
IID_IMarshal
,
riid
))
*
ppv
=
NULL
;
else
if
(
IsEqualGUID
(
&
IID_IManagedObject
,
riid
))
*
ppv
=
NULL
;
else
return
FALSE
;
...
...
dlls/mshtml/htmldoc.c
View file @
9141c97d
...
...
@@ -4572,9 +4572,6 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
}
else
if
(
IsEqualGUID
(
&
IID_IPersistPropertyBag
,
riid
))
{
TRACE
(
"(%p)->(IID_IPersistPropertyBag %p) returning NULL
\n
"
,
This
,
ppv
);
*
ppv
=
NULL
;
}
else
if
(
IsEqualGUID
(
&
IID_IMarshal
,
riid
))
{
TRACE
(
"(%p)->(IID_IMarshal %p) returning NULL
\n
"
,
This
,
ppv
);
*
ppv
=
NULL
;
}
else
if
(
IsEqualGUID
(
&
IID_IExternalConnection
,
riid
))
{
TRACE
(
"(%p)->(IID_IExternalConnection %p) returning NULL
\n
"
,
This
,
ppv
);
*
ppv
=
NULL
;
...
...
dlls/mshtml/htmllocation.c
View file @
9141c97d
...
...
@@ -87,6 +87,10 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r
*
ppv
=
&
This
->
IHTMLLocation_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IHTMLLocation
,
riid
))
{
*
ppv
=
&
This
->
IHTMLLocation_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IMarshal
,
riid
))
{
*
ppv
=
NULL
;
FIXME
(
"(%p)->(IID_IMarshal %p)
\n
"
,
This
,
ppv
);
return
E_NOINTERFACE
;
}
else
if
(
dispex_query_interface
(
&
This
->
dispex
,
riid
,
ppv
))
{
return
*
ppv
?
S_OK
:
E_NOINTERFACE
;
}
else
{
...
...
dlls/mshtml/htmlwindow.c
View file @
9141c97d
...
...
@@ -184,6 +184,10 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii
*
ppv
=
&
This
->
ITravelLogClient_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IObjectIdentity
,
riid
))
{
*
ppv
=
&
This
->
IObjectIdentity_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IMarshal
,
riid
))
{
*
ppv
=
NULL
;
FIXME
(
"(%p)->(IID_IMarshal %p)
\n
"
,
This
,
ppv
);
return
E_NOINTERFACE
;
}
else
if
(
dispex_query_interface
(
&
This
->
inner_window
->
event_target
.
dispex
,
riid
,
ppv
))
{
assert
(
!*
ppv
);
return
E_NOINTERFACE
;
...
...
dlls/mshtml/main.c
View file @
9141c97d
...
...
@@ -43,6 +43,7 @@
#include "mshtml_private.h"
#include "resource.h"
#include "pluginhost.h"
#include "mscoree.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
mshtml
);
...
...
@@ -588,6 +589,8 @@ const char *debugstr_mshtml_guid(const GUID *iid)
X
(
IID_IHTMLPrivateWindow
);
X
(
IID_IHtmlLoadOptions
);
X
(
IID_IInternetHostSecurityManager
);
X
(
IID_IManagedObject
);
X
(
IID_IMarshal
);
X
(
IID_IMonikerProp
);
X
(
IID_IObjectIdentity
);
X
(
IID_IObjectSafety
);
...
...
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