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
fe863e03
Commit
fe863e03
authored
Jun 30, 2008
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 01, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Silence common invalid QueryInterface FIXME.
parent
af3d19fa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
dispex.c
dlls/mshtml/dispex.c
+6
-0
htmldoc.c
dlls/mshtml/htmldoc.c
+2
-0
htmlwindow.c
dlls/mshtml/htmlwindow.c
+2
-0
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+11
-3
No files found.
dlls/mshtml/dispex.c
View file @
fe863e03
...
...
@@ -623,12 +623,18 @@ static IDispatchExVtbl DispatchExVtbl = {
BOOL
dispex_query_interface
(
DispatchEx
*
This
,
REFIID
riid
,
void
**
ppv
)
{
static
const
IID
IID_UndocumentedScriptIface
=
{
0x719c3050
,
0xf9d3
,
0x11cf
,{
0xa4
,
0x93
,
0x00
,
0x40
,
0x05
,
0x23
,
0xa8
,
0xa0
}};
if
(
IsEqualGUID
(
&
IID_IDispatch
,
riid
))
{
TRACE
(
"(%p)->(IID_IDispatch %p)
\n
"
,
This
,
ppv
);
*
ppv
=
DISPATCHEX
(
This
);
}
else
if
(
IsEqualGUID
(
&
IID_IDispatchEx
,
riid
))
{
TRACE
(
"(%p)->(IID_IDispatchEx %p)
\n
"
,
This
,
ppv
);
*
ppv
=
DISPATCHEX
(
This
);
}
else
if
(
IsEqualGUID
(
&
IID_UndocumentedScriptIface
,
riid
))
{
TRACE
(
"(%p)->(IID_UndocumentedScriptIface %p) returning NULL
\n
"
,
This
,
ppv
);
*
ppv
=
NULL
;
}
else
{
return
FALSE
;
}
...
...
dlls/mshtml/htmldoc.c
View file @
fe863e03
...
...
@@ -134,6 +134,8 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID
}
else
if
(
IsEqualGUID
(
&
IID_IRunnableObject
,
riid
))
{
TRACE
(
"(%p)->(IID_IRunnableObject %p) returning NULL
\n
"
,
This
,
ppvObject
);
return
E_NOINTERFACE
;
}
else
if
(
dispex_query_interface
(
&
This
->
dispex
,
riid
,
ppvObject
))
{
return
*
ppvObject
?
S_OK
:
E_NOINTERFACE
;
}
if
(
*
ppvObject
)
{
...
...
dlls/mshtml/htmlwindow.c
View file @
fe863e03
...
...
@@ -61,6 +61,8 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii
}
else
if
(
IsEqualGUID
(
&
IID_IHTMLWindow3
,
riid
))
{
TRACE
(
"(%p)->(IID_IHTMLWindow2 %p)
\n
"
,
This
,
ppv
);
*
ppv
=
HTMLWINDOW3
(
This
);
}
else
if
(
dispex_query_interface
(
&
This
->
dispex
,
riid
,
ppv
))
{
return
*
ppv
?
S_OK
:
E_NOINTERFACE
;
}
if
(
*
ppv
)
{
...
...
dlls/mshtml/tests/htmldoc.c
View file @
fe863e03
...
...
@@ -3701,20 +3701,28 @@ static void test_QueryInterface(IUnknown *unk)
IUnknown
*
qi
;
HRESULT
hres
;
static
const
IID
IID_UndocumentedScriptIface
=
{
0x719c3050
,
0xf9d3
,
0x11cf
,{
0xa4
,
0x93
,
0x00
,
0x40
,
0x05
,
0x23
,
0xa8
,
0xa0
}};
qi
=
(
void
*
)
0xdeadbeef
;
hres
=
IUnknown_QueryInterface
(
unk
,
&
IID_IRunnableObject
,
(
void
**
)
&
qi
);
ok
(
hres
==
E_NOINTERFACE
,
"QueryInterface returned %08x, expected E_NOINTERFACE
\n
"
,
hres
);
ok
(
qi
==
NULL
,
"runnable=%p, ezpected NULL
\n
"
,
qi
);
ok
(
qi
==
NULL
,
"
qi
runnable=%p, ezpected NULL
\n
"
,
qi
);
qi
=
(
void
*
)
0xdeadbeef
;
hres
=
IUnknown_QueryInterface
(
unk
,
&
IID_IHTMLDOMNode
,
(
void
**
)
&
qi
);
ok
(
hres
==
E_NOINTERFACE
,
"QueryInterface returned %08x, expected E_NOINTERFACE
\n
"
,
hres
);
ok
(
qi
==
NULL
,
"
runnable
=%p, ezpected NULL
\n
"
,
qi
);
ok
(
qi
==
NULL
,
"
qi
=%p, ezpected NULL
\n
"
,
qi
);
qi
=
(
void
*
)
0xdeadbeef
;
hres
=
IUnknown_QueryInterface
(
unk
,
&
IID_IHTMLDOMNode2
,
(
void
**
)
&
qi
);
ok
(
hres
==
E_NOINTERFACE
,
"QueryInterface returned %08x, expected E_NOINTERFACE
\n
"
,
hres
);
ok
(
qi
==
NULL
,
"runnable=%p, ezpected NULL
\n
"
,
qi
);
ok
(
qi
==
NULL
,
"qi=%p, ezpected NULL
\n
"
,
qi
);
qi
=
(
void
*
)
0xdeadbeef
;
hres
=
IUnknown_QueryInterface
(
unk
,
&
IID_UndocumentedScriptIface
,
(
void
**
)
&
qi
);
ok
(
hres
==
E_NOINTERFACE
,
"QueryInterface returned %08x, expected E_NOINTERFACE
\n
"
,
hres
);
ok
(
qi
==
NULL
,
"qi=%p, ezpected NULL
\n
"
,
qi
);
}
static
void
init_test
(
enum
load_state_t
ls
)
{
...
...
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