Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5ed0ddd9
Commit
5ed0ddd9
authored
Feb 28, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ieframe: Fixed QI tests on IE10, where IStdMarshalInfo is supported by WebBrowser object.
parent
99a86766
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
webbrowser.c
dlls/ieframe/tests/webbrowser.c
+0
-5
webbrowser.c
dlls/ieframe/webbrowser.c
+2
-1
No files found.
dlls/ieframe/tests/webbrowser.c
View file @
5ed0ddd9
...
...
@@ -2951,7 +2951,6 @@ static void test_QueryInterface(IWebBrowser2 *wb)
IViewObjectEx
*
viewex
=
(
void
*
)
0xdeadbeef
;
IOleLink
*
link
=
(
void
*
)
0xdeadbeef
;
IMarshal
*
marshal
=
(
void
*
)
0xdeadbeef
;
IStdMarshalInfo
*
marshalinfo
=
(
void
*
)
0xdeadbeef
;
IUnknown
*
unk
=
(
IUnknown
*
)
wb
;
HRESULT
hres
;
...
...
@@ -2991,10 +2990,6 @@ static void test_QueryInterface(IWebBrowser2 *wb)
ok
(
hres
==
E_NOINTERFACE
,
"QueryInterface returned %08x, expected E_NOINTERFACE
\n
"
,
hres
);
ok
(
marshal
==
NULL
,
"marshal=%p, expected NULL
\n
"
,
marshal
);
hres
=
IUnknown_QueryInterface
(
unk
,
&
IID_IStdMarshalInfo
,
(
void
**
)
&
marshalinfo
);
ok
(
hres
==
E_NOINTERFACE
,
"QueryInterface returned %08x, expected E_NOINTERFACE
\n
"
,
hres
);
ok
(
marshalinfo
==
NULL
,
"marshalinfo=%p, expected NULL
\n
"
,
marshalinfo
);
}
static
void
test_UIActivate
(
IWebBrowser2
*
unk
,
BOOL
activate
)
...
...
dlls/ieframe/webbrowser.c
View file @
5ed0ddd9
...
...
@@ -135,7 +135,8 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
TRACE
(
"(%p)->(IID_IMarshal %p) returning NULL
\n
"
,
This
,
ppv
);
return
E_NOINTERFACE
;
}
else
if
(
IsEqualGUID
(
&
IID_IStdMarshalInfo
,
riid
))
{
TRACE
(
"(%p)->(IID_IStdMarshalInfo %p) returning NULL
\n
"
,
This
,
ppv
);
/* This is implemented since IE10 */
WARN
(
"(%p)->(IID_IStdMarshalInfo %p) returning NULL
\n
"
,
This
,
ppv
);
return
E_NOINTERFACE
;
}
else
if
(
HlinkFrame_QI
(
&
This
->
hlink_frame
,
riid
,
ppv
))
{
return
S_OK
;
...
...
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