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
df05902b
Commit
df05902b
authored
May 11, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
May 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7c46e56c
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
0 additions
and
64 deletions
+0
-64
avico.c
dlls/qcap/avico.c
+0
-7
avimux.c
dlls/qcap/avimux.c
+0
-7
smartteefilter.c
dlls/qcap/smartteefilter.c
+0
-16
vfwcapture.c
dlls/qcap/vfwcapture.c
+0
-1
filesource.c
dlls/quartz/filesource.c
+0
-1
parser.c
dlls/quartz/parser.c
+0
-1
pin.c
dlls/strmbase/pin.c
+0
-25
transform.c
dlls/strmbase/transform.c
+0
-1
gstdemux.c
dlls/winegstreamer/gstdemux.c
+0
-1
qtsplitter.c
dlls/wineqtdecoder/qtsplitter.c
+0
-1
strmbase.h
include/wine/strmbase.h
+0
-3
No files found.
dlls/qcap/avico.c
View file @
df05902b
...
@@ -657,12 +657,6 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base,
...
@@ -657,12 +657,6 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base,
return
BaseOutputPinImpl_DecideAllocator
(
base
,
pPin
,
pAlloc
);
return
BaseOutputPinImpl_DecideAllocator
(
base
,
pPin
,
pAlloc
);
}
}
static
HRESULT
WINAPI
AVICompressorOut_BreakConnect
(
BaseOutputPin
*
base
)
{
FIXME
(
"(%p)
\n
"
,
base
);
return
E_NOTIMPL
;
}
static
const
BaseOutputPinFuncTable
AVICompressorBaseOutputPinVtbl
=
{
static
const
BaseOutputPinFuncTable
AVICompressorBaseOutputPinVtbl
=
{
{
{
NULL
,
NULL
,
...
@@ -671,7 +665,6 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
...
@@ -671,7 +665,6 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
AVICompressorOut_DecideBufferSize
,
AVICompressorOut_DecideBufferSize
,
AVICompressorOut_DecideAllocator
,
AVICompressorOut_DecideAllocator
,
AVICompressorOut_BreakConnect
};
};
IUnknown
*
WINAPI
QCAP_createAVICompressor
(
IUnknown
*
outer
,
HRESULT
*
phr
)
IUnknown
*
WINAPI
QCAP_createAVICompressor
(
IUnknown
*
outer
,
HRESULT
*
phr
)
...
...
dlls/qcap/avimux.c
View file @
df05902b
...
@@ -1292,12 +1292,6 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base,
...
@@ -1292,12 +1292,6 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base,
return
IMemInputPin_NotifyAllocator
(
pPin
,
*
pAlloc
,
TRUE
);
return
IMemInputPin_NotifyAllocator
(
pPin
,
*
pAlloc
,
TRUE
);
}
}
static
HRESULT
WINAPI
AviMuxOut_BreakConnect
(
BaseOutputPin
*
base
)
{
FIXME
(
"(%p)
\n
"
,
base
);
return
E_NOTIMPL
;
}
static
const
BaseOutputPinFuncTable
AviMuxOut_BaseOutputFuncTable
=
{
static
const
BaseOutputPinFuncTable
AviMuxOut_BaseOutputFuncTable
=
{
{
{
AviMuxOut_CheckMediaType
,
AviMuxOut_CheckMediaType
,
...
@@ -1306,7 +1300,6 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
...
@@ -1306,7 +1300,6 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
AviMuxOut_AttemptConnection
,
AviMuxOut_AttemptConnection
,
NULL
,
NULL
,
AviMuxOut_DecideAllocator
,
AviMuxOut_DecideAllocator
,
AviMuxOut_BreakConnect
};
};
static
inline
AviMux
*
impl_from_out_IPin
(
IPin
*
iface
)
static
inline
AviMux
*
impl_from_out_IPin
(
IPin
*
iface
)
...
...
dlls/qcap/smartteefilter.c
View file @
df05902b
...
@@ -498,13 +498,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base,
...
@@ -498,13 +498,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base,
return
IMemInputPin_NotifyAllocator
(
pPin
,
This
->
input
->
pAllocator
,
TRUE
);
return
IMemInputPin_NotifyAllocator
(
pPin
,
This
->
input
->
pAllocator
,
TRUE
);
}
}
static
HRESULT
WINAPI
SmartTeeFilterCapture_BreakConnect
(
BaseOutputPin
*
base
)
{
SmartTeeFilter
*
This
=
impl_from_BasePin
(
&
base
->
pin
);
FIXME
(
"(%p): stub
\n
"
,
This
);
return
E_NOTIMPL
;
}
static
const
BaseOutputPinFuncTable
SmartTeeFilterCaptureFuncs
=
{
static
const
BaseOutputPinFuncTable
SmartTeeFilterCaptureFuncs
=
{
{
{
SmartTeeFilterCapture_CheckMediaType
,
SmartTeeFilterCapture_CheckMediaType
,
...
@@ -513,7 +506,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
...
@@ -513,7 +506,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
NULL
,
NULL
,
SmartTeeFilterCapture_DecideAllocator
,
SmartTeeFilterCapture_DecideAllocator
,
SmartTeeFilterCapture_BreakConnect
};
};
static
ULONG
WINAPI
SmartTeeFilterPreview_AddRef
(
IPin
*
iface
)
static
ULONG
WINAPI
SmartTeeFilterPreview_AddRef
(
IPin
*
iface
)
...
@@ -589,13 +581,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base,
...
@@ -589,13 +581,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base,
return
IMemInputPin_NotifyAllocator
(
pPin
,
This
->
input
->
pAllocator
,
TRUE
);
return
IMemInputPin_NotifyAllocator
(
pPin
,
This
->
input
->
pAllocator
,
TRUE
);
}
}
static
HRESULT
WINAPI
SmartTeeFilterPreview_BreakConnect
(
BaseOutputPin
*
base
)
{
SmartTeeFilter
*
This
=
impl_from_BasePin
(
&
base
->
pin
);
FIXME
(
"(%p): stub
\n
"
,
This
);
return
E_NOTIMPL
;
}
static
const
BaseOutputPinFuncTable
SmartTeeFilterPreviewFuncs
=
{
static
const
BaseOutputPinFuncTable
SmartTeeFilterPreviewFuncs
=
{
{
{
SmartTeeFilterPreview_CheckMediaType
,
SmartTeeFilterPreview_CheckMediaType
,
...
@@ -604,7 +589,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
...
@@ -604,7 +589,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
NULL
,
NULL
,
SmartTeeFilterPreview_DecideAllocator
,
SmartTeeFilterPreview_DecideAllocator
,
SmartTeeFilterPreview_BreakConnect
};
};
IUnknown
*
WINAPI
QCAP_createSmartTeeFilter
(
IUnknown
*
outer
,
HRESULT
*
phr
)
IUnknown
*
WINAPI
QCAP_createSmartTeeFilter
(
IUnknown
*
outer
,
HRESULT
*
phr
)
{
{
...
...
dlls/qcap/vfwcapture.c
View file @
df05902b
...
@@ -707,7 +707,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
...
@@ -707,7 +707,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
VfwPin_DecideBufferSize
,
VfwPin_DecideBufferSize
,
BaseOutputPinImpl_DecideAllocator
,
BaseOutputPinImpl_DecideAllocator
,
BaseOutputPinImpl_BreakConnect
};
};
static
HRESULT
static
HRESULT
...
...
dlls/quartz/filesource.c
View file @
df05902b
...
@@ -914,7 +914,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
...
@@ -914,7 +914,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
FileAsyncReaderPin_AttemptConnection
,
FileAsyncReaderPin_AttemptConnection
,
FileAsyncReaderPin_DecideBufferSize
,
FileAsyncReaderPin_DecideBufferSize
,
BaseOutputPinImpl_DecideAllocator
,
BaseOutputPinImpl_DecideAllocator
,
BaseOutputPinImpl_BreakConnect
};
};
static
HRESULT
FileAsyncReader_Construct
(
HANDLE
hFile
,
IBaseFilter
*
pBaseFilter
,
LPCRITICAL_SECTION
pCritSec
,
IPin
**
ppPin
)
static
HRESULT
FileAsyncReader_Construct
(
HANDLE
hFile
,
IBaseFilter
*
pBaseFilter
,
LPCRITICAL_SECTION
pCritSec
,
IPin
**
ppPin
)
...
...
dlls/quartz/parser.c
View file @
df05902b
...
@@ -428,7 +428,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
...
@@ -428,7 +428,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
Parser_OutputPin_DecideBufferSize
,
Parser_OutputPin_DecideBufferSize
,
Parser_OutputPin_DecideAllocator
,
Parser_OutputPin_DecideAllocator
,
NULL
,
};
};
HRESULT
Parser_AddPin
(
ParserImpl
*
This
,
const
PIN_INFO
*
piOutput
,
ALLOCATOR_PROPERTIES
*
props
,
const
AM_MEDIA_TYPE
*
amt
)
HRESULT
Parser_AddPin
(
ParserImpl
*
This
,
const
PIN_INFO
*
piOutput
,
ALLOCATOR_PROPERTIES
*
props
,
const
AM_MEDIA_TYPE
*
amt
)
...
...
dlls/strmbase/pin.c
View file @
df05902b
...
@@ -639,31 +639,6 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This)
...
@@ -639,31 +639,6 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This)
return
hr
;
return
hr
;
}
}
/* replaces OutputPin_DeliverDisconnect */
HRESULT
WINAPI
BaseOutputPinImpl_BreakConnect
(
BaseOutputPin
*
This
)
{
HRESULT
hr
;
TRACE
(
"(%p)->()
\n
"
,
This
);
EnterCriticalSection
(
This
->
pin
.
pCritSec
);
{
if
(
!
This
->
pin
.
pConnectedTo
||
!
This
->
pMemInputPin
)
hr
=
VFW_E_NOT_CONNECTED
;
else
{
hr
=
IMemAllocator_Decommit
(
This
->
pAllocator
);
if
(
SUCCEEDED
(
hr
))
hr
=
IPin_Disconnect
(
This
->
pin
.
pConnectedTo
);
}
IPin_Disconnect
(
&
This
->
pin
.
IPin_iface
);
}
LeaveCriticalSection
(
This
->
pin
.
pCritSec
);
return
hr
;
}
HRESULT
WINAPI
BaseOutputPinImpl_InitAllocator
(
BaseOutputPin
*
This
,
IMemAllocator
**
pMemAlloc
)
HRESULT
WINAPI
BaseOutputPinImpl_InitAllocator
(
BaseOutputPin
*
This
,
IMemAllocator
**
pMemAlloc
)
{
{
return
CoCreateInstance
(
&
CLSID_MemoryAllocator
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IMemAllocator
,
(
LPVOID
*
)
pMemAlloc
);
return
CoCreateInstance
(
&
CLSID_MemoryAllocator
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID_IMemAllocator
,
(
LPVOID
*
)
pMemAlloc
);
...
...
dlls/strmbase/transform.c
View file @
df05902b
...
@@ -165,7 +165,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = {
...
@@ -165,7 +165,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
TransformFilter_Output_DecideBufferSize
,
TransformFilter_Output_DecideBufferSize
,
BaseOutputPinImpl_DecideAllocator
,
BaseOutputPinImpl_DecideAllocator
,
BaseOutputPinImpl_BreakConnect
};
};
static
HRESULT
TransformFilter_Init
(
const
IBaseFilterVtbl
*
pVtbl
,
const
CLSID
*
pClsid
,
const
TransformFilterFuncTable
*
pFuncsTable
,
TransformFilter
*
pTransformFilter
)
static
HRESULT
TransformFilter_Init
(
const
IBaseFilterVtbl
*
pVtbl
,
const
CLSID
*
pClsid
,
const
TransformFilterFuncTable
*
pFuncsTable
,
TransformFilter
*
pTransformFilter
)
...
...
dlls/winegstreamer/gstdemux.c
View file @
df05902b
...
@@ -1879,7 +1879,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
...
@@ -1879,7 +1879,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
GSTOutPin_DecideBufferSize
,
GSTOutPin_DecideBufferSize
,
GSTOutPin_DecideAllocator
,
GSTOutPin_DecideAllocator
,
NULL
,
};
};
static
HRESULT
GST_AddPin
(
GSTImpl
*
This
,
const
PIN_INFO
*
piOutput
,
const
AM_MEDIA_TYPE
*
amt
)
static
HRESULT
GST_AddPin
(
GSTImpl
*
This
,
const
PIN_INFO
*
piOutput
,
const
AM_MEDIA_TYPE
*
amt
)
...
...
dlls/wineqtdecoder/qtsplitter.c
View file @
df05902b
...
@@ -1520,7 +1520,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
...
@@ -1520,7 +1520,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
BaseOutputPinImpl_AttemptConnection
,
BaseOutputPinImpl_AttemptConnection
,
QTOutPin_DecideBufferSize
,
QTOutPin_DecideBufferSize
,
QTOutPin_DecideAllocator
,
QTOutPin_DecideAllocator
,
NULL
,
};
};
static
const
OutputQueueFuncTable
output_OutputQueueFuncTable
=
{
static
const
OutputQueueFuncTable
output_OutputQueueFuncTable
=
{
...
...
include/wine/strmbase.h
View file @
df05902b
...
@@ -67,7 +67,6 @@ typedef struct BaseOutputPin
...
@@ -67,7 +67,6 @@ typedef struct BaseOutputPin
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_AttemptConnection
)(
BaseOutputPin
*
pin
,
IPin
*
peer
,
const
AM_MEDIA_TYPE
*
mt
);
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_AttemptConnection
)(
BaseOutputPin
*
pin
,
IPin
*
peer
,
const
AM_MEDIA_TYPE
*
mt
);
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_DecideBufferSize
)(
BaseOutputPin
*
This
,
IMemAllocator
*
pAlloc
,
ALLOCATOR_PROPERTIES
*
ppropInputRequest
);
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_DecideBufferSize
)(
BaseOutputPin
*
This
,
IMemAllocator
*
pAlloc
,
ALLOCATOR_PROPERTIES
*
ppropInputRequest
);
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_DecideAllocator
)(
BaseOutputPin
*
This
,
IMemInputPin
*
pPin
,
IMemAllocator
**
pAlloc
);
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_DecideAllocator
)(
BaseOutputPin
*
This
,
IMemInputPin
*
pPin
,
IMemAllocator
**
pAlloc
);
typedef
HRESULT
(
WINAPI
*
BaseOutputPin_BreakConnect
)(
BaseOutputPin
*
This
);
typedef
struct
BaseOutputPinFuncTable
{
typedef
struct
BaseOutputPinFuncTable
{
BasePinFuncTable
base
;
BasePinFuncTable
base
;
...
@@ -78,7 +77,6 @@ typedef struct BaseOutputPinFuncTable {
...
@@ -78,7 +77,6 @@ typedef struct BaseOutputPinFuncTable {
BaseOutputPin_DecideBufferSize
pfnDecideBufferSize
;
BaseOutputPin_DecideBufferSize
pfnDecideBufferSize
;
/* Required for BaseOutputPinImpl_AttemptConnection */
/* Required for BaseOutputPinImpl_AttemptConnection */
BaseOutputPin_DecideAllocator
pfnDecideAllocator
;
BaseOutputPin_DecideAllocator
pfnDecideAllocator
;
BaseOutputPin_BreakConnect
pfnBreakConnect
;
}
BaseOutputPinFuncTable
;
}
BaseOutputPinFuncTable
;
typedef
struct
BaseInputPin
typedef
struct
BaseInputPin
...
@@ -129,7 +127,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface);
...
@@ -129,7 +127,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface);
HRESULT
WINAPI
BaseOutputPinImpl_GetDeliveryBuffer
(
BaseOutputPin
*
This
,
IMediaSample
**
ppSample
,
REFERENCE_TIME
*
tStart
,
REFERENCE_TIME
*
tStop
,
DWORD
dwFlags
);
HRESULT
WINAPI
BaseOutputPinImpl_GetDeliveryBuffer
(
BaseOutputPin
*
This
,
IMediaSample
**
ppSample
,
REFERENCE_TIME
*
tStart
,
REFERENCE_TIME
*
tStop
,
DWORD
dwFlags
);
HRESULT
WINAPI
BaseOutputPinImpl_Deliver
(
BaseOutputPin
*
This
,
IMediaSample
*
pSample
);
HRESULT
WINAPI
BaseOutputPinImpl_Deliver
(
BaseOutputPin
*
This
,
IMediaSample
*
pSample
);
HRESULT
WINAPI
BaseOutputPinImpl_BreakConnect
(
BaseOutputPin
*
This
);
HRESULT
WINAPI
BaseOutputPinImpl_Active
(
BaseOutputPin
*
This
);
HRESULT
WINAPI
BaseOutputPinImpl_Active
(
BaseOutputPin
*
This
);
HRESULT
WINAPI
BaseOutputPinImpl_Inactive
(
BaseOutputPin
*
This
);
HRESULT
WINAPI
BaseOutputPinImpl_Inactive
(
BaseOutputPin
*
This
);
HRESULT
WINAPI
BaseOutputPinImpl_InitAllocator
(
BaseOutputPin
*
This
,
IMemAllocator
**
pMemAlloc
);
HRESULT
WINAPI
BaseOutputPinImpl_InitAllocator
(
BaseOutputPin
*
This
,
IMemAllocator
**
pMemAlloc
);
...
...
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