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
b3f0f07d
Commit
b3f0f07d
authored
Dec 10, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 10, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IBindHost::CreateMoniker implementation.
parent
d43fb00e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
pluginhost.c
dlls/mshtml/pluginhost.c
+9
-2
activex.c
dlls/mshtml/tests/activex.c
+10
-2
No files found.
dlls/mshtml/pluginhost.c
View file @
b3f0f07d
...
...
@@ -800,8 +800,15 @@ static ULONG WINAPI PHBindHost_Release(IBindHost *iface)
static
HRESULT
WINAPI
PHBindHost_CreateMoniker
(
IBindHost
*
iface
,
LPOLESTR
szName
,
IBindCtx
*
pBC
,
IMoniker
**
ppmk
,
DWORD
dwReserved
)
{
PluginHost
*
This
=
impl_from_IBindHost
(
iface
);
FIXME
(
"(%p)->(%s %p %p %x)
\n
"
,
This
,
debugstr_w
(
szName
),
pBC
,
ppmk
,
dwReserved
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%s %p %p %x)
\n
"
,
This
,
debugstr_w
(
szName
),
pBC
,
ppmk
,
dwReserved
);
if
(
!
This
->
doc
||
!
This
->
doc
->
basedoc
.
window
||
!
This
->
doc
->
basedoc
.
window
->
mon
)
{
FIXME
(
"no moniker
\n
"
);
return
E_UNEXPECTED
;
}
return
CreateURLMoniker
(
This
->
doc
->
basedoc
.
window
->
mon
,
szName
,
ppmk
);
}
static
HRESULT
WINAPI
PHBindHost_MonikerBindToStorage
(
IBindHost
*
iface
,
IMoniker
*
pMk
,
IBindCtx
*
pBC
,
...
...
dlls/mshtml/tests/activex.c
View file @
b3f0f07d
...
...
@@ -355,6 +355,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper
static
const
WCHAR
param_nameW
[]
=
{
'p'
,
'a'
,
'r'
,
'a'
,
'm'
,
'_'
,
'n'
,
'a'
,
'm'
,
'e'
,
0
};
static
const
WCHAR
num_paramW
[]
=
{
'n'
,
'u'
,
'm'
,
'_'
,
'p'
,
'a'
,
'r'
,
'a'
,
'm'
,
0
};
static
const
WCHAR
no_paramW
[]
=
{
'n'
,
'o'
,
'_'
,
'p'
,
'a'
,
'r'
,
'a'
,
'm'
,
0
};
static
WCHAR
test_swfW
[]
=
{
't'
,
'e'
,
's'
,
't'
,
'.'
,
's'
,
'w'
,
'f'
,
0
};
static
const
IID
*
propbag_ifaces
[]
=
{
&
IID_IPropertyBag
,
...
...
@@ -418,14 +419,21 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper
IBindHost_Release
(
bind_host2
);
mon
=
NULL
;
hres
=
IBindHost_CreateMoniker
(
bind_host
,
test_swfW
,
NULL
,
&
mon
,
0
);
ok
(
hres
==
S_OK
,
"CreateMoniker failed: %08x
\n
"
,
hres
);
ok
(
mon
!=
NULL
,
"mon == NULL
\n
"
);
test_mon_displayname
(
mon
,
"about:test.swf"
);
IMoniker_Release
(
mon
);
IBindHost_Release
(
bind_host
);
mon
=
NULL
;
hres
=
IOleClientSite_GetMoniker
(
client_site
,
OLEGETMONIKER_ONLYIFTHERE
,
OLEWHICHMK_CONTAINER
,
&
mon
);
ok
(
hres
==
S_OK
,
"GetMoniker failed: %08x
\n
"
,
hres
);
ok
(
mon
!=
NULL
,
"mon == NULL
\n
"
);
test_mon_displayname
(
mon
,
"about:blank"
);
IMoniker_Release
(
mon
);
IBindHost_Release
(
bind_host
);
set_plugin_readystate
(
READYSTATE_COMPLETE
);
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