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
1f8e505d
Commit
1f8e505d
authored
14 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
avifil32: COM cleanup for acmstream.c.
parent
97fa635f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/avifil32/acmstream.c
+21
-16
21 additions, 16 deletions
dlls/avifil32/acmstream.c
with
21 additions
and
16 deletions
dlls/avifil32/acmstream.c
+
21
−
16
View file @
1f8e505d
...
...
@@ -70,7 +70,7 @@ static const struct IAVIStreamVtbl iacmst = {
typedef
struct
_IAVIStreamImpl
{
/* IUnknown stuff */
const
IAVIStream
Vtbl
*
lpVtbl
;
IAVIStream
IAVIStream_iface
;
LONG
ref
;
/* IAVIStream stuff */
...
...
@@ -117,19 +117,24 @@ HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppv)
if
(
pstream
==
NULL
)
return
AVIERR_MEMORY
;
pstream
->
lpVtbl
=
&
iacmst
;
pstream
->
IAVIStream_iface
.
lpVtbl
=
&
iacmst
;
hr
=
IAVIStream_QueryInterface
(
(
IAVIStream
*
)
pstream
,
riid
,
ppv
);
hr
=
IAVIStream_QueryInterface
(
&
pstream
->
IAVIStream
_iface
,
riid
,
ppv
);
if
(
FAILED
(
hr
))
HeapFree
(
GetProcessHeap
(),
0
,
pstream
);
return
hr
;
}
static
inline
IAVIStreamImpl
*
impl_from_IAVIStream
(
IAVIStream
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IAVIStreamImpl
,
IAVIStream_iface
);
}
static
HRESULT
WINAPI
ACMStream_fnQueryInterface
(
IAVIStream
*
iface
,
REFIID
refiid
,
LPVOID
*
obj
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,%s,%p)
\n
"
,
iface
,
debugstr_guid
(
refiid
),
obj
);
...
...
@@ -146,7 +151,7 @@ static HRESULT WINAPI ACMStream_fnQueryInterface(IAVIStream *iface,
static
ULONG
WINAPI
ACMStream_fnAddRef
(
IAVIStream
*
iface
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"(%p) -> %d
\n
"
,
iface
,
ref
);
...
...
@@ -160,7 +165,7 @@ static ULONG WINAPI ACMStream_fnAddRef(IAVIStream *iface)
static
ULONG
WINAPI
ACMStream_fnRelease
(
IAVIStream
*
iface
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"(%p) -> %d
\n
"
,
iface
,
ref
);
...
...
@@ -209,7 +214,7 @@ static ULONG WINAPI ACMStream_fnRelease(IAVIStream* iface)
static
HRESULT
WINAPI
ACMStream_fnCreate
(
IAVIStream
*
iface
,
LPARAM
lParam1
,
LPARAM
lParam2
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,0x%08lX,0x%08lX)
\n
"
,
iface
,
lParam1
,
lParam2
);
...
...
@@ -262,7 +267,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1,
static
HRESULT
WINAPI
ACMStream_fnInfo
(
IAVIStream
*
iface
,
LPAVISTREAMINFOW
psi
,
LONG
size
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,%p,%d)
\n
"
,
iface
,
psi
,
size
);
...
...
@@ -289,7 +294,7 @@ static HRESULT WINAPI ACMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi,
static
LONG
WINAPI
ACMStream_fnFindSample
(
IAVIStream
*
iface
,
LONG
pos
,
LONG
flags
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,%d,0x%08X)
\n
"
,
iface
,
pos
,
flags
);
...
...
@@ -317,7 +322,7 @@ static LONG WINAPI ACMStream_fnFindSample(IAVIStream *iface, LONG pos,
static
HRESULT
WINAPI
ACMStream_fnReadFormat
(
IAVIStream
*
iface
,
LONG
pos
,
LPVOID
format
,
LONG
*
formatsize
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,%d,%p,%p)
\n
"
,
iface
,
pos
,
format
,
formatsize
);
...
...
@@ -352,7 +357,7 @@ static HRESULT WINAPI ACMStream_fnReadFormat(IAVIStream *iface, LONG pos,
static
HRESULT
WINAPI
ACMStream_fnSetFormat
(
IAVIStream
*
iface
,
LONG
pos
,
LPVOID
format
,
LONG
formatsize
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
HRESULT
hr
;
...
...
@@ -399,7 +404,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start,
LONG
buffersize
,
LPLONG
bytesread
,
LPLONG
samplesread
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
HRESULT
hr
;
DWORD
size
;
...
...
@@ -520,7 +525,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start,
LPLONG
sampwritten
,
LPLONG
byteswritten
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
HRESULT
hr
;
ULONG
size
;
...
...
@@ -613,7 +618,7 @@ static HRESULT WINAPI ACMStream_fnWrite(IAVIStream *iface, LONG start,
static
HRESULT
WINAPI
ACMStream_fnDelete
(
IAVIStream
*
iface
,
LONG
start
,
LONG
samples
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,%d,%d)
\n
"
,
iface
,
start
,
samples
);
...
...
@@ -647,7 +652,7 @@ static HRESULT WINAPI ACMStream_fnDelete(IAVIStream *iface, LONG start,
static
HRESULT
WINAPI
ACMStream_fnReadData
(
IAVIStream
*
iface
,
DWORD
fcc
,
LPVOID
lp
,
LPLONG
lpread
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,0x%08X,%p,%p)
\n
"
,
iface
,
fcc
,
lp
,
lpread
);
...
...
@@ -659,7 +664,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream *iface, DWORD fcc,
static
HRESULT
WINAPI
ACMStream_fnWriteData
(
IAVIStream
*
iface
,
DWORD
fcc
,
LPVOID
lp
,
LONG
size
)
{
IAVIStreamImpl
*
This
=
(
IAVIStream
Impl
*
)
iface
;
IAVIStreamImpl
*
This
=
impl_from_
IAVIStream
(
iface
)
;
TRACE
(
"(%p,0x%08x,%p,%d)
\n
"
,
iface
,
fcc
,
lp
,
size
);
...
...
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