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
3ec3fa5e
Commit
3ec3fa5e
authored
May 08, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 08, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explorer: Return desktop shellview interface.
parent
7ce1813f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
shelldispatch.c
dlls/shell32/tests/shelldispatch.c
+4
-0
desktop.c
programs/explorer/desktop.c
+13
-2
No files found.
dlls/shell32/tests/shelldispatch.c
View file @
3ec3fa5e
...
...
@@ -631,6 +631,10 @@ if (hr == S_OK)
hr
=
IShellBrowser_QueryInterface
(
sb
,
&
IID_IDispatch
,
(
void
**
)
&
unk
);
ok
(
hr
==
E_NOINTERFACE
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IShellBrowser_QueryActiveShellView
(
sb
,
&
sv
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
IShellView_Release
(
sv
);
IShellBrowser_Release
(
sb2
);
IShellBrowser_Release
(
sb
);
...
...
programs/explorer/desktop.c
View file @
3ec3fa5e
...
...
@@ -141,6 +141,7 @@ struct shellbrowserwindow
IWebBrowser2
IWebBrowser2_iface
;
IServiceProvider
IServiceProvider_iface
;
IShellBrowser
IShellBrowser_iface
;
IShellView
*
view
;
};
static
struct
shellwindows
shellwindows
;
...
...
@@ -2103,8 +2104,11 @@ static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id,
static
HRESULT
WINAPI
shellbrowser_QueryActiveShellView
(
IShellBrowser
*
iface
,
IShellView
**
view
)
{
FIXME
(
"%p
\n
"
,
view
);
return
E_NOTIMPL
;
TRACE
(
"%p
\n
"
,
view
);
*
view
=
desktopshellbrowserwindow
.
view
;
IShellView_AddRef
(
*
view
);
return
S_OK
;
}
static
HRESULT
WINAPI
shellbrowser_OnViewWindowActive
(
IShellBrowser
*
iface
,
IShellView
*
view
)
...
...
@@ -2143,9 +2147,16 @@ static const IShellBrowserVtbl shellbrowservtbl = {
static
void
desktopshellbrowserwindow_init
(
void
)
{
IShellFolder
*
folder
;
desktopshellbrowserwindow
.
IWebBrowser2_iface
.
lpVtbl
=
&
webbrowser2vtbl
;
desktopshellbrowserwindow
.
IServiceProvider_iface
.
lpVtbl
=
&
serviceprovidervtbl
;
desktopshellbrowserwindow
.
IShellBrowser_iface
.
lpVtbl
=
&
shellbrowservtbl
;
if
(
FAILED
(
SHGetDesktopFolder
(
&
folder
)))
return
;
IShellFolder_CreateViewObject
(
folder
,
NULL
,
&
IID_IShellView
,
(
void
**
)
&
desktopshellbrowserwindow
.
view
);
}
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