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
3c7bf035
Commit
3c7bf035
authored
Apr 30, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 04, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explorer: Added stub IServiceProvider support for shell browser window.
parent
68c5fed5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
3 deletions
+47
-3
shelldispatch.c
dlls/shell32/tests/shelldispatch.c
+3
-3
desktop.c
programs/explorer/desktop.c
+44
-0
No files found.
dlls/shell32/tests/shelldispatch.c
View file @
3c7bf035
...
...
@@ -572,12 +572,12 @@ if (hr == S_OK) {
ok
(
hr
==
E_NOINTERFACE
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IDispatch_QueryInterface
(
disp
,
&
IID_IServiceProvider
,
(
void
**
)
&
sp
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
{
hr
=
IServiceProvider_QueryService
(
sp
,
&
SID_STopLevelBrowser
,
&
IID_IShellBrowser
,
(
void
**
)
&
sb
);
todo_wine
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
{
hr
=
IServiceProvider_QueryService
(
sp
,
&
SID_STopLevelBrowser
,
&
IID_IShellBrowser
,
(
void
**
)
&
sb2
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
sb
==
sb2
,
"got %p, %p
\n
"
,
sb
,
sb2
);
...
...
programs/explorer/desktop.c
View file @
3c7bf035
...
...
@@ -139,6 +139,7 @@ struct shellwindows
struct
shellbrowserwindow
{
IWebBrowser2
IWebBrowser2_iface
;
IServiceProvider
IServiceProvider_iface
;
};
static
struct
shellwindows
shellwindows
;
...
...
@@ -154,6 +155,11 @@ static inline struct shellbrowserwindow *impl_from_IWebBrowser2(IWebBrowser2 *if
return
CONTAINING_RECORD
(
iface
,
struct
shellbrowserwindow
,
IWebBrowser2_iface
);
}
static
inline
struct
shellbrowserwindow
*
impl_from_IServiceProvider
(
IServiceProvider
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
struct
shellbrowserwindow
,
IServiceProvider_iface
);
}
static
void
shellwindows_init
(
void
);
static
void
desktopshellbrowserwindow_init
(
void
);
...
...
@@ -1281,6 +1287,10 @@ static HRESULT WINAPI webbrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid
{
*
ppv
=
&
This
->
IWebBrowser2_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IServiceProvider
,
riid
))
{
*
ppv
=
&
This
->
IServiceProvider_iface
;
}
if
(
*
ppv
)
{
...
...
@@ -1908,9 +1918,43 @@ static const IWebBrowser2Vtbl webbrowser2vtbl =
webbrowser_put_Resizable
};
static
HRESULT
WINAPI
serviceprovider_QueryInterface
(
IServiceProvider
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
struct
shellbrowserwindow
*
This
=
impl_from_IServiceProvider
(
iface
);
return
IWebBrowser2_QueryInterface
(
&
This
->
IWebBrowser2_iface
,
riid
,
ppv
);
}
static
ULONG
WINAPI
serviceprovider_AddRef
(
IServiceProvider
*
iface
)
{
struct
shellbrowserwindow
*
This
=
impl_from_IServiceProvider
(
iface
);
return
IWebBrowser2_AddRef
(
&
This
->
IWebBrowser2_iface
);
}
static
ULONG
WINAPI
serviceprovider_Release
(
IServiceProvider
*
iface
)
{
struct
shellbrowserwindow
*
This
=
impl_from_IServiceProvider
(
iface
);
return
IWebBrowser2_Release
(
&
This
->
IWebBrowser2_iface
);
}
static
HRESULT
WINAPI
serviceprovider_QueryService
(
IServiceProvider
*
iface
,
REFGUID
service
,
REFIID
riid
,
void
**
ppv
)
{
FIXME
(
"%s %s %p
\n
"
,
debugstr_guid
(
service
),
debugstr_guid
(
riid
),
ppv
);
return
E_NOTIMPL
;
}
static
const
IServiceProviderVtbl
serviceprovidervtbl
=
{
serviceprovider_QueryInterface
,
serviceprovider_AddRef
,
serviceprovider_Release
,
serviceprovider_QueryService
};
static
void
desktopshellbrowserwindow_init
(
void
)
{
desktopshellbrowserwindow
.
IWebBrowser2_iface
.
lpVtbl
=
&
webbrowser2vtbl
;
desktopshellbrowserwindow
.
IServiceProvider_iface
.
lpVtbl
=
&
serviceprovidervtbl
;
}
static
void
shellwindows_init
(
void
)
...
...
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