Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
2b55b5b6
Commit
2b55b5b6
authored
13 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl.
parent
aba87e0f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/amstream/mediastream.c
+26
-26
26 additions, 26 deletions
dlls/amstream/mediastream.c
with
26 additions
and
26 deletions
dlls/amstream/mediastream.c
+
26
−
26
View file @
2b55b5b6
...
...
@@ -52,7 +52,6 @@ typedef struct {
}
IDirectDrawMediaStreamImpl
;
static
const
struct
IMediaStreamVtbl
MediaStream_Vtbl
;
static
const
struct
IDirectDrawMediaStreamVtbl
DirectDrawMediaStream_Vtbl
;
HRESULT
MediaStream_create
(
IMultiMediaStream
*
Parent
,
const
MSPID
*
pPurposeId
,
STREAM_TYPE
StreamType
,
IMediaStream
**
ppMediaStream
)
{
...
...
@@ -194,31 +193,6 @@ static const struct IMediaStreamVtbl MediaStream_Vtbl =
IMediaStreamImpl_SendEndOfStream
};
HRESULT
DirectDrawMediaStream_create
(
IMultiMediaStream
*
Parent
,
const
MSPID
*
pPurposeId
,
STREAM_TYPE
StreamType
,
IMediaStream
**
ppMediaStream
)
{
IDirectDrawMediaStreamImpl
*
object
;
TRACE
(
"(%p,%s,%p)
\n
"
,
Parent
,
debugstr_guid
(
pPurposeId
),
ppMediaStream
);
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IMediaStreamImpl
));
if
(
!
object
)
{
ERR
(
"Out of memory
\n
"
);
return
E_OUTOFMEMORY
;
}
object
->
IDirectDrawMediaStream_iface
.
lpVtbl
=
&
DirectDrawMediaStream_Vtbl
;
object
->
ref
=
1
;
object
->
Parent
=
Parent
;
object
->
PurposeId
=
*
pPurposeId
;
object
->
StreamType
=
StreamType
;
*
ppMediaStream
=
(
IMediaStream
*
)
&
object
->
IDirectDrawMediaStream_iface
;
return
S_OK
;
}
static
inline
IDirectDrawMediaStreamImpl
*
impl_from_IDirectDrawMediaStream
(
IDirectDrawMediaStream
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDirectDrawMediaStreamImpl
,
IDirectDrawMediaStream_iface
);
...
...
@@ -322,3 +296,29 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl =
IDirectDrawMediaStreamImpl_GetTimePerFrame
};
#undef XCAST
HRESULT
DirectDrawMediaStream_create
(
IMultiMediaStream
*
Parent
,
const
MSPID
*
pPurposeId
,
STREAM_TYPE
StreamType
,
IMediaStream
**
ppMediaStream
)
{
IDirectDrawMediaStreamImpl
*
object
;
TRACE
(
"(%p,%s,%p)
\n
"
,
Parent
,
debugstr_guid
(
pPurposeId
),
ppMediaStream
);
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IMediaStreamImpl
));
if
(
!
object
)
{
ERR
(
"Out of memory
\n
"
);
return
E_OUTOFMEMORY
;
}
object
->
IDirectDrawMediaStream_iface
.
lpVtbl
=
&
DirectDrawMediaStream_Vtbl
;
object
->
ref
=
1
;
object
->
Parent
=
Parent
;
object
->
PurposeId
=
*
pPurposeId
;
object
->
StreamType
=
StreamType
;
*
ppMediaStream
=
(
IMediaStream
*
)
&
object
->
IDirectDrawMediaStream_iface
;
return
S_OK
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment