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
4ea1f357
Commit
4ea1f357
authored
Jul 27, 2014
by
Thomas Faber
Committed by
Alexandre Julliard
Jul 28, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Separate BasePin destructors from Release.
parent
33e0e686
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
11 deletions
+25
-11
pin.c
dlls/strmbase/pin.c
+23
-11
strmbase.h
include/wine/strmbase.h
+2
-0
No files found.
dlls/strmbase/pin.c
View file @
4ea1f357
...
...
@@ -401,11 +401,7 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface)
if
(
!
refCount
)
{
FreeMediaType
(
&
This
->
pin
.
mtCurrent
);
if
(
This
->
pAllocator
)
IMemAllocator_Release
(
This
->
pAllocator
);
This
->
pAllocator
=
NULL
;
CoTaskMemFree
(
This
);
BaseOutputPin_Destroy
(
This
);
return
0
;
}
return
refCount
;
...
...
@@ -849,6 +845,16 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp
return
E_FAIL
;
}
HRESULT
WINAPI
BaseOutputPin_Destroy
(
BaseOutputPin
*
This
)
{
FreeMediaType
(
&
This
->
pin
.
mtCurrent
);
if
(
This
->
pAllocator
)
IMemAllocator_Release
(
This
->
pAllocator
);
This
->
pAllocator
=
NULL
;
CoTaskMemFree
(
This
);
return
S_OK
;
}
/*** Input Pin implementation ***/
static
inline
BaseInputPin
*
impl_BaseInputPin_from_IPin
(
IPin
*
iface
)
...
...
@@ -900,12 +906,7 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface)
if
(
!
refCount
)
{
FreeMediaType
(
&
This
->
pin
.
mtCurrent
);
if
(
This
->
pAllocator
)
IMemAllocator_Release
(
This
->
pAllocator
);
This
->
pAllocator
=
NULL
;
This
->
pin
.
IPin_iface
.
lpVtbl
=
NULL
;
CoTaskMemFree
(
This
);
BaseInputPin_Destroy
(
This
);
return
0
;
}
else
...
...
@@ -1273,3 +1274,14 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size
CoTaskMemFree
(
pPinImpl
);
return
E_FAIL
;
}
HRESULT
WINAPI
BaseInputPin_Destroy
(
BaseInputPin
*
This
)
{
FreeMediaType
(
&
This
->
pin
.
mtCurrent
);
if
(
This
->
pAllocator
)
IMemAllocator_Release
(
This
->
pAllocator
);
This
->
pAllocator
=
NULL
;
This
->
pin
.
IPin_iface
.
lpVtbl
=
NULL
;
CoTaskMemFree
(
This
);
return
S_OK
;
}
include/wine/strmbase.h
View file @
4ea1f357
...
...
@@ -136,6 +136,7 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputP
HRESULT
WINAPI
BaseOutputPinImpl_AttemptConnection
(
BasePin
*
This
,
IPin
*
pReceivePin
,
const
AM_MEDIA_TYPE
*
pmt
);
HRESULT
WINAPI
BaseOutputPin_Construct
(
const
IPinVtbl
*
OutputPin_Vtbl
,
LONG
outputpin_size
,
const
PIN_INFO
*
pPinInfo
,
const
BaseOutputPinFuncTable
*
pBaseOutputFuncsTable
,
LPCRITICAL_SECTION
pCritSec
,
IPin
**
ppPin
);
HRESULT
WINAPI
BaseOutputPin_Destroy
(
BaseOutputPin
*
This
);
/* Base Input Pin */
HRESULT
WINAPI
BaseInputPinImpl_QueryInterface
(
IPin
*
iface
,
REFIID
riid
,
LPVOID
*
ppv
);
...
...
@@ -151,6 +152,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart,
HRESULT
BaseInputPin_Construct
(
const
IPinVtbl
*
InputPin_Vtbl
,
LONG
inputpin_size
,
const
PIN_INFO
*
pPinInfo
,
const
BaseInputPinFuncTable
*
pBaseInputFuncsTable
,
LPCRITICAL_SECTION
pCritSec
,
IMemAllocator
*
,
IPin
**
ppPin
);
HRESULT
WINAPI
BaseInputPin_Destroy
(
BaseInputPin
*
This
);
typedef
struct
BaseFilter
{
...
...
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