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
5c8339df
Commit
5c8339df
authored
Nov 25, 2013
by
Piotr Caban
Committed by
Alexandre Julliard
Nov 25, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Add structure size parameter in BaseInputPin_Construct function.
parent
e9cc5426
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
6 deletions
+12
-6
mediastreamfilter.c
dlls/amstream/mediastreamfilter.c
+2
-1
pin.c
dlls/strmbase/pin.c
+3
-2
renderer.c
dlls/strmbase/renderer.c
+2
-1
transform.c
dlls/strmbase/transform.c
+2
-1
strmbase.h
include/wine/strmbase.h
+3
-1
No files found.
dlls/amstream/mediastreamfilter.c
View file @
5c8339df
...
...
@@ -367,7 +367,8 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
/* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */
info
.
achName
[
0
]
=
'I'
;
StringFromGUID2
(
&
purpose_id
,
info
.
achName
+
1
,
40
);
hr
=
BaseInputPin_Construct
(
&
MediaStreamFilter_InputPin_Vtbl
,
&
info
,
&
input_BaseFuncTable
,
&
input_BaseInputFuncTable
,
&
This
->
filter
.
csFilter
,
NULL
,
&
This
->
pins
[
This
->
nb_streams
]);
hr
=
BaseInputPin_Construct
(
&
MediaStreamFilter_InputPin_Vtbl
,
sizeof
(
BaseInputPin
),
&
info
,
&
input_BaseFuncTable
,
&
input_BaseInputFuncTable
,
&
This
->
filter
.
csFilter
,
NULL
,
&
This
->
pins
[
This
->
nb_streams
]);
if
(
FAILED
(
hr
))
return
hr
;
...
...
dlls/strmbase/pin.c
View file @
5c8339df
...
...
@@ -1237,7 +1237,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi
return
S_OK
;
}
HRESULT
BaseInputPin_Construct
(
const
IPinVtbl
*
InputPin_Vtbl
,
const
PIN_INFO
*
pPinInfo
,
HRESULT
BaseInputPin_Construct
(
const
IPinVtbl
*
InputPin_Vtbl
,
LONG
inputpin_size
,
const
PIN_INFO
*
pPinInfo
,
const
BasePinFuncTable
*
pBaseFuncsTable
,
const
BaseInputPinFuncTable
*
pBaseInputFuncsTable
,
LPCRITICAL_SECTION
pCritSec
,
IMemAllocator
*
allocator
,
IPin
**
ppPin
)
{
...
...
@@ -1245,6 +1245,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * p
*
ppPin
=
NULL
;
assert
(
inputpin_size
>=
sizeof
(
BaseInputPin
));
assert
(
pBaseFuncsTable
->
pfnCheckMediaType
);
if
(
pPinInfo
->
dir
!=
PINDIR_INPUT
)
...
...
@@ -1253,7 +1254,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * p
return
E_INVALIDARG
;
}
pPinImpl
=
CoTaskMemAlloc
(
sizeof
(
*
pPinImpl
)
);
pPinImpl
=
CoTaskMemAlloc
(
inputpin_size
);
if
(
!
pPinImpl
)
return
E_OUTOFMEMORY
;
...
...
dlls/strmbase/renderer.c
View file @
5c8339df
...
...
@@ -253,7 +253,8 @@ HRESULT WINAPI BaseRenderer_Init(BaseRenderer * This, const IBaseFilterVtbl *Vtb
piInput
.
pFilter
=
&
This
->
filter
.
IBaseFilter_iface
;
lstrcpynW
(
piInput
.
achName
,
wcsInputPinName
,
sizeof
(
piInput
.
achName
)
/
sizeof
(
piInput
.
achName
[
0
]));
hr
=
BaseInputPin_Construct
(
&
BaseRenderer_InputPin_Vtbl
,
&
piInput
,
&
input_BaseFuncTable
,
&
input_BaseInputFuncTable
,
&
This
->
filter
.
csFilter
,
NULL
,
(
IPin
**
)
&
This
->
pInputPin
);
hr
=
BaseInputPin_Construct
(
&
BaseRenderer_InputPin_Vtbl
,
sizeof
(
BaseInputPin
),
&
piInput
,
&
input_BaseFuncTable
,
&
input_BaseInputFuncTable
,
&
This
->
filter
.
csFilter
,
NULL
,
(
IPin
**
)
&
This
->
pInputPin
);
if
(
SUCCEEDED
(
hr
))
{
...
...
dlls/strmbase/transform.c
View file @
5c8339df
...
...
@@ -225,7 +225,8 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p
piOutput
.
pFilter
=
&
pTransformFilter
->
filter
.
IBaseFilter_iface
;
lstrcpynW
(
piOutput
.
achName
,
wcsOutputPinName
,
sizeof
(
piOutput
.
achName
)
/
sizeof
(
piOutput
.
achName
[
0
]));
hr
=
BaseInputPin_Construct
(
&
TransformFilter_InputPin_Vtbl
,
&
piInput
,
&
tf_input_BaseFuncTable
,
&
tf_input_BaseInputFuncTable
,
&
pTransformFilter
->
filter
.
csFilter
,
NULL
,
&
pTransformFilter
->
ppPins
[
0
]);
hr
=
BaseInputPin_Construct
(
&
TransformFilter_InputPin_Vtbl
,
sizeof
(
BaseInputPin
),
&
piInput
,
&
tf_input_BaseFuncTable
,
&
tf_input_BaseInputFuncTable
,
&
pTransformFilter
->
filter
.
csFilter
,
NULL
,
&
pTransformFilter
->
ppPins
[
0
]);
if
(
SUCCEEDED
(
hr
))
{
...
...
include/wine/strmbase.h
View file @
5c8339df
...
...
@@ -145,7 +145,9 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface);
HRESULT
WINAPI
BaseInputPinImpl_EndFlush
(
IPin
*
iface
);
HRESULT
WINAPI
BaseInputPinImpl_NewSegment
(
IPin
*
iface
,
REFERENCE_TIME
tStart
,
REFERENCE_TIME
tStop
,
double
dRate
);
HRESULT
BaseInputPin_Construct
(
const
IPinVtbl
*
InputPin_Vtbl
,
const
PIN_INFO
*
pPinInfo
,
const
BasePinFuncTable
*
pBaseFuncsTable
,
const
BaseInputPinFuncTable
*
pBaseInputFuncsTable
,
LPCRITICAL_SECTION
pCritSec
,
IMemAllocator
*
,
IPin
**
ppPin
);
HRESULT
BaseInputPin_Construct
(
const
IPinVtbl
*
InputPin_Vtbl
,
LONG
inputpin_size
,
const
PIN_INFO
*
pPinInfo
,
const
BasePinFuncTable
*
pBaseFuncsTable
,
const
BaseInputPinFuncTable
*
pBaseInputFuncsTable
,
LPCRITICAL_SECTION
pCritSec
,
IMemAllocator
*
,
IPin
**
ppPin
);
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