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
b0f4ed18
Commit
b0f4ed18
authored
Feb 24, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Feb 24, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wmp: Return success in IPersistStreamInit::InitNew.
parent
2b04a5e3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
oleobj.c
dlls/wmp/oleobj.c
+9
-2
oleobj.c
dlls/wmp/tests/oleobj.c
+8
-0
No files found.
dlls/wmp/oleobj.c
View file @
b0f4ed18
...
...
@@ -744,8 +744,15 @@ static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface,
static
HRESULT
WINAPI
PersistStreamInit_InitNew
(
IPersistStreamInit
*
iface
)
{
WindowsMediaPlayer
*
This
=
impl_from_IPersistStreamInit
(
iface
);
FIXME
(
"(%p)
\n
"
,
This
);
return
E_NOTIMPL
;
TRACE
(
"(%p)
\n
"
,
This
);
if
(
!
This
->
client_site
)
return
E_FAIL
;
/* Nothing to do, yet. */
get_container_hwnd
(
This
);
return
S_OK
;
}
static
const
IPersistStreamInitVtbl
PersistStreamInitVtbl
=
{
...
...
dlls/wmp/tests/oleobj.c
View file @
b0f4ed18
...
...
@@ -877,6 +877,9 @@ static void test_wmp(void)
hres
=
IOleObject_QueryInterface
(
oleobj
,
&
IID_IOleInPlaceObject
,
(
void
**
)
&
ipobj
);
ok
(
hres
==
S_OK
,
"Could not get IOleInPlaceObject iface: %08x
\n
"
,
hres
);
hres
=
IPersistStreamInit_InitNew
(
psi
);
ok
(
hres
==
E_FAIL
||
broken
(
hres
==
S_OK
/* Old WMP */
),
"InitNew failed: %08x
\n
"
,
hres
);
SET_EXPECT
(
GetContainer
);
SET_EXPECT
(
GetExtendedControl
);
SET_EXPECT
(
GetWindow
);
...
...
@@ -893,6 +896,11 @@ static void test_wmp(void)
ok
(
hres
==
S_OK
,
"GetClientSite failed: %08x
\n
"
,
hres
);
ok
(
client_site
==
&
ClientSite
,
"client_site != ClientSite
\n
"
);
SET_EXPECT
(
GetWindow
);
hres
=
IPersistStreamInit_InitNew
(
psi
);
ok
(
hres
==
S_OK
,
"InitNew failed: %08x
\n
"
,
hres
);
CHECK_CALLED
(
GetWindow
);
hwnd
=
(
HWND
)
0xdeadbeef
;
hres
=
IOleInPlaceObject_GetWindow
(
ipobj
,
&
hwnd
);
ok
(
hres
==
E_UNEXPECTED
,
"GetWindow failed: %08x
\n
"
,
hres
);
...
...
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