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
73f80669
Commit
73f80669
authored
Jul 16, 2017
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Jul 17, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wmvcore: Support IWMReaderPlaylistBurn interface in IWMReader.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b15c3985
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
0 deletions
+75
-0
wmvcore.c
dlls/wmvcore/tests/wmvcore.c
+6
-0
wmvcore_main.c
dlls/wmvcore/wmvcore_main.c
+69
-0
No files found.
dlls/wmvcore/tests/wmvcore.c
View file @
73f80669
...
...
@@ -81,6 +81,7 @@ static void test_wmreader_interfaces(void)
IWMDRMReader
*
drmreader
;
IWMDRMReader2
*
drmreader2
;
IWMDRMReader3
*
drmreader3
;
IWMReaderPlaylistBurn
*
playlist
;
hr
=
WMCreateReader
(
NULL
,
0
,
&
reader
);
ok
(
hr
==
S_OK
,
"WMCreateReader failed 0x%08x
\n
"
,
hr
);
...
...
@@ -147,6 +148,9 @@ static void test_wmreader_interfaces(void)
hr
=
IWMReader_QueryInterface
(
reader
,
&
IID_IWMDRMReader3
,
(
void
**
)
&
drmreader3
);
ok
(
hr
==
E_NOINTERFACE
,
"Failed 0x%08x
\n
"
,
hr
);
hr
=
IWMReader_QueryInterface
(
reader
,
&
IID_IWMReaderPlaylistBurn
,
(
void
**
)
&
playlist
);
ok
(
hr
==
S_OK
,
"Failed 0x%08x
\n
"
,
hr
);
if
(
packet
)
IWMPacketSize_Release
(
packet
);
if
(
packet2
)
...
...
@@ -179,6 +183,8 @@ static void test_wmreader_interfaces(void)
IWMReaderStreamClock_Release
(
clock
);
if
(
negotiation
)
IWMReaderTypeNegotiation_Release
(
negotiation
);
if
(
playlist
)
IWMReaderPlaylistBurn_Release
(
playlist
);
IWMReader_Release
(
reader
);
}
...
...
dlls/wmvcore/wmvcore_main.c
View file @
73f80669
...
...
@@ -71,6 +71,7 @@ typedef struct {
IWMReaderStreamClock
IWMReaderStreamClock_iface
;
IWMReaderTypeNegotiation
IWMReaderTypeNegotiation_iface
;
IWMReaderTimecode
IWMReaderTimecode_iface
;
IWMReaderPlaylistBurn
IWMReaderPlaylistBurn_iface
;
LONG
ref
;
}
WMReader
;
...
...
@@ -125,6 +126,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi
}
else
if
(
IsEqualGUID
(
riid
,
&
IID_IWMReaderTimecode
))
{
TRACE
(
"(%p)->(IWMReaderTimecode %p)
\n
"
,
This
,
ppv
);
*
ppv
=
&
This
->
IWMReaderTimecode_iface
;
}
else
if
(
IsEqualGUID
(
riid
,
&
IID_IWMReaderPlaylistBurn
))
{
TRACE
(
"(%p)->(IWMReaderPlaylistBurn %p)
\n
"
,
This
,
ppv
);
*
ppv
=
&
This
->
IWMReaderPlaylistBurn_iface
;
}
else
{
*
ppv
=
NULL
;
FIXME
(
"(%p)->(%s %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppv
);
...
...
@@ -1283,6 +1287,70 @@ static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl =
timecode_GetTimecodeRangeBounds
};
static
inline
WMReader
*
impl_from_IWMReaderPlaylistBurn
(
IWMReaderPlaylistBurn
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
WMReader
,
IWMReaderPlaylistBurn_iface
);
}
static
HRESULT
WINAPI
playlist_QueryInterface
(
IWMReaderPlaylistBurn
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
return
IWMReader_QueryInterface
(
&
This
->
IWMReader_iface
,
riid
,
ppv
);
}
static
ULONG
WINAPI
playlist_AddRef
(
IWMReaderPlaylistBurn
*
iface
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
return
IWMReader_AddRef
(
&
This
->
IWMReader_iface
);
}
static
ULONG
WINAPI
playlist_Release
(
IWMReaderPlaylistBurn
*
iface
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
return
IWMReader_Release
(
&
This
->
IWMReader_iface
);
}
static
HRESULT
WINAPI
playlist_InitPlaylistBurn
(
IWMReaderPlaylistBurn
*
iface
,
DWORD
count
,
LPCWSTR_WMSDK_TYPE_SAFE
*
filenames
,
IWMStatusCallback
*
callback
,
void
*
context
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
FIXME
(
"%p, %d, %p, %p, %p
\n
"
,
This
,
count
,
filenames
,
callback
,
context
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
playlist_GetInitResults
(
IWMReaderPlaylistBurn
*
iface
,
DWORD
count
,
HRESULT
*
stat
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
FIXME
(
"%p, %d, %p
\n
"
,
This
,
count
,
stat
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
playlist_Cancel
(
IWMReaderPlaylistBurn
*
iface
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
FIXME
(
"%p
\n
"
,
This
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
playlist_EndPlaylistBurn
(
IWMReaderPlaylistBurn
*
iface
,
HRESULT
result
)
{
WMReader
*
This
=
impl_from_IWMReaderPlaylistBurn
(
iface
);
FIXME
(
"%p, 0x%08x
\n
"
,
This
,
result
);
return
E_NOTIMPL
;
}
static
const
IWMReaderPlaylistBurnVtbl
WMReaderPlaylistBurnVtbl
=
{
playlist_QueryInterface
,
playlist_AddRef
,
playlist_Release
,
playlist_InitPlaylistBurn
,
playlist_GetInitResults
,
playlist_Cancel
,
playlist_EndPlaylistBurn
};
HRESULT
WINAPI
WMCreateReader
(
IUnknown
*
reserved
,
DWORD
rights
,
IWMReader
**
ret_reader
)
{
WMReader
*
reader
;
...
...
@@ -1300,6 +1368,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_
reader
->
IWMReaderStreamClock_iface
.
lpVtbl
=
&
WMReaderStreamClockVtbl
;
reader
->
IWMReaderTypeNegotiation_iface
.
lpVtbl
=
&
WMReaderTypeNegotiationVtbl
;
reader
->
IWMReaderTimecode_iface
.
lpVtbl
=
&
WMReaderTimecodeVtbl
;
reader
->
IWMReaderPlaylistBurn_iface
.
lpVtbl
=
&
WMReaderPlaylistBurnVtbl
;
reader
->
ref
=
1
;
*
ret_reader
=
&
reader
->
IWMReader_iface
;
...
...
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