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
366aa9e7
Commit
366aa9e7
authored
Feb 19, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wshom.ocx: Fix WshShell instance QI behaviour.
parent
c633cadb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
5 deletions
+18
-5
shell.c
dlls/wshom.ocx/shell.c
+6
-4
wshom.c
dlls/wshom.ocx/tests/wshom.c
+12
-1
No files found.
dlls/wshom.ocx/shell.c
View file @
366aa9e7
...
...
@@ -817,9 +817,11 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v
*
ppv
=
NULL
;
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IDispatch
)
||
IsEqualGUID
(
riid
,
&
IID_IWshShell3
))
if
(
IsEqualGUID
(
riid
,
&
IID_IDispatch
)
||
IsEqualGUID
(
riid
,
&
IID_IWshShell3
)
||
IsEqualGUID
(
riid
,
&
IID_IWshShell2
)
||
IsEqualGUID
(
riid
,
&
IID_IWshShell
)
||
IsEqualGUID
(
riid
,
&
IID_IUnknown
))
{
*
ppv
=
iface
;
}
...
...
@@ -829,7 +831,7 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v
}
else
{
FIXME
(
"U
nknown iface %s
\n
"
,
debugstr_guid
(
riid
));
WARN
(
"u
nknown iface %s
\n
"
,
debugstr_guid
(
riid
));
return
E_NOINTERFACE
;
}
...
...
dlls/wshom.ocx/tests/wshom.c
View file @
366aa9e7
...
...
@@ -44,7 +44,7 @@ static void test_wshshell(void)
IDispatchEx
*
dispex
;
IWshCollection
*
coll
;
IDispatch
*
disp
,
*
shortcut
;
IUnknown
*
shell
;
IUnknown
*
shell
,
*
unk
;
IFolderCollection
*
folders
;
IWshShortcut
*
shcut
;
ITypeInfo
*
ti
;
...
...
@@ -71,6 +71,17 @@ static void test_wshshell(void)
hr
=
IUnknown_QueryInterface
(
shell
,
&
IID_IWshShell3
,
(
void
**
)
&
sh3
);
EXPECT_HR
(
hr
,
S_OK
);
hr
=
IWshShell3_QueryInterface
(
sh3
,
&
IID_IObjectWithSite
,
(
void
**
)
&
unk
);
ok
(
hr
==
E_NOINTERFACE
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IWshShell3_QueryInterface
(
sh3
,
&
IID_IWshShell
,
(
void
**
)
&
unk
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
IUnknown_Release
(
unk
);
hr
=
IWshShell3_QueryInterface
(
sh3
,
&
IID_IWshShell2
,
(
void
**
)
&
unk
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
IUnknown_Release
(
unk
);
hr
=
IWshShell3_get_SpecialFolders
(
sh3
,
&
coll
);
EXPECT_HR
(
hr
,
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