[PATCH] wineqtdecoder: Fix macos compile error

[Alistair Leslie-Hughes]

Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e

Signed-off-by: Alistair Leslie-Hughes 
---
 dlls/wineqtdecoder/qtsplitter.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
index 5b1e82ebc9b..956dd0a7d0d 100644
--- a/dlls/wineqtdecoder/qtsplitter.c
+++ b/dlls/wineqtdecoder/qtsplitter.c
@@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
     QTSplitter *filter = impl_from_strmbase_filter(iface);
     HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr;

-    EnterCriticalSection(&This->csReceive);
+    EnterCriticalSection(&filter->csReceive);

if (filter->pVideo_Pin)
         pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin);
@@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
         hr = pin_hr;
     SetEvent(filter->runEvent);

-    LeaveCriticalSection(&This->csReceive);
+    LeaveCriticalSection(&filter->csReceive);

return hr;
 }
@@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface)
 {
     QTSplitter *filter = impl_from_strmbase_filter(iface);

-    EnterCriticalSection(&This->csReceive);
+    EnterCriticalSection(&filter->csReceive);
     IAsyncReader_BeginFlush(filter->pInputPin.pReader);
     IAsyncReader_EndFlush(filter->pInputPin.pReader);
-    LeaveCriticalSection(&This->csReceive);
+    LeaveCriticalSection(&filter->csReceive);

return S_OK;
 }
@@ -1170,8 +1170,6 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p
         *ppv = iface;
     else if (IsEqualIID(riid, &IID_IPin))
         *ppv = iface;
-    else if (IsEqualIID(riid, &IID_IMediaSeeking))
-        *ppv = &This->sourceSeeking.IMediaSeeking_iface;
     else if (IsEqualIID(riid, &IID_IQualityControl))
         *ppv = &This->IQualityControl_iface;

[Zebediah Figura]

On 12/7/19 12:03 AM, Alistair Leslie-Hughes wrote:
> Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e
> Signed-off-by: Alistair Leslie-Hughes
>
> dlls/wineqtdecoder/qtsplitter.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)

Hello Alistair, thanks for catching these errors.
> diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
> index 5b1e82ebc9b..956dd0a7d0d 100644
> --- a/dlls/wineqtdecoder/qtsplitter.c
> +++ b/dlls/wineqtdecoder/qtsplitter.c
> @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
>      QTSplitter *filter = impl_from_strmbase_filter(iface);
>      HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr;
> - EnterCriticalSection(&This->csReceive);
> -
>
> EnterCriticalSection(&filter->csReceive);
>
> if (filter->pVideo_Pin)
>     pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin);
>
> @@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
>          hr = pin_hr;
>      SetEvent(filter->runEvent);
> - LeaveCriticalSection(&This->csReceive);
> -
>
> LeaveCriticalSection(&filter->csReceive);
>
> return hr;
>
> }
> @@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface)
>  {
>      QTSplitter *filter = impl_from_strmbase_filter(iface);
> - EnterCriticalSection(&This->csReceive);
> - EnterCriticalSection(&filter->csReceive);
> IAsyncReader_BeginFlush(filter->pInputPin.pReader);
> IAsyncReader_EndFlush(filter->pInputPin.pReader);
> - LeaveCriticalSection(&This->csReceive);
> -
>
> LeaveCriticalSection(&filter->csReceive);
>
> return S_OK;
>
> }
> @@ -1170,8 +1170,6 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p
>          *ppv = iface;
>      else if (IsEqualIID(riid, &IID_IPin))
>          *ppv = iface;
> - else if (IsEqualIID(riid, &IID_IMediaSeeking))
> -
>    *ppv = &This->sourceSeeking.IMediaSeeking_iface;
> else if (IsEqualIID(riid, &IID_IQualityControl))
>        *ppv = &This->IQualityControl_iface;

Did you mean to do this?

[Alistair Leslie-Hughes]

Hi Zebediah,

On 8/12/19 2:58 am, Zebediah Figura wrote:
> On 12/7/19 12:03 AM, Alistair Leslie-Hughes wrote:
> >
>
> Did you mean to do this? >

Yes,
[22:38:21] ../../../wine/dlls/wineqtdecoder/qtsplitter.c:1174:23: error: 
no member named 'sourceSeeking' in 'struct QTOutPin'
[22:38:21]         *ppv = &This->sourceSeeking.IMediaSeeking_iface;

Alistair.

[Zebediah Figura]

On 12/7/19 3:21 PM, Alistair Leslie-Hughes wrote:
> Hi Zebediah,
>
> On 8/12/19 2:58 am, Zebediah Figura wrote:
> > On 12/7/19 12:03 AM, Alistair Leslie-Hughes wrote:
> > >
> >
> > Did you mean to do this? >
>
> Yes,
> [22:38:21] ../../../wine/dlls/wineqtdecoder/qtsplitter.c:1174:23: error: 
> no member named 'sourceSeeking' in 'struct QTOutPin'
> [22:38:21]         *ppv = &This->sourceSeeking.IMediaSeeking_iface;

Bah, okay. Still, removing the interface entirely isn't the right
solution either. I'll send a patch to fix this.
> Alistair.

[Mathew Hodson]

On Sat, Dec 7, 2019 at 1:03 AM Alistair Leslie-Hughes
 wrote:
> Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e
> Signed-off-by: Alistair Leslie-Hughes
>
> dlls/wineqtdecoder/qtsplitter.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
> index 5b1e82ebc9b..956dd0a7d0d 100644
> --- a/dlls/wineqtdecoder/qtsplitter.c
> +++ b/dlls/wineqtdecoder/qtsplitter.c
> @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
>      QTSplitter *filter = impl_from_strmbase_filter(iface);
>      HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr;
> - EnterCriticalSection(&This->csReceive);
> - EnterCriticalSection(&filter->csReceive);

Wouldn't the original commit have failed to compile on all platforms?

Where is the This variable defined?

[Alistair Leslie-Hughes]

Hi Mathew,

On 8/12/19 2:22 pm, Mathew Hodson wrote:
> On Sat, Dec 7, 2019 at 1:03 AM Alistair Leslie-Hughes
>  wrote:
> > Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e
> > Signed-off-by: Alistair Leslie-Hughes
> >
> > dlls/wineqtdecoder/qtsplitter.c | 10 ++++------
> >   1 file changed, 4 insertions(+), 6 deletions(-)
> >
> > diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
> > index 5b1e82ebc9b..956dd0a7d0d 100644
> > --- a/dlls/wineqtdecoder/qtsplitter.c
> > +++ b/dlls/wineqtdecoder/qtsplitter.c
> > @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
> >       QTSplitter *filter = impl_from_strmbase_filter(iface);
> >       HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr;
> > - EnterCriticalSection(&This->csReceive);
> > - EnterCriticalSection(&filter->csReceive);
>
> Wouldn't the original commit have failed to compile on all platforms?

The macos build isn't part of the normal build verification process, so 
sometimes things are missed.  This isn't the first, nor will be that 
last ;)
> Where is the This variable defined?

The code was changed to use filter instead of This.

Regards
Alistair.

[Matteo Bruni]

On Sun, Dec 8, 2019 at 4:22 AM Mathew Hodson  wrote:
> On Sat, Dec 7, 2019 at 1:03 AM Alistair Leslie-Hughes
>  wrote:
> > Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e
> > Signed-off-by: Alistair Leslie-Hughes
> >
> > dlls/wineqtdecoder/qtsplitter.c | 10 ++++------
> >  1 file changed, 4 insertions(+), 6 deletions(-)
> >
> > diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c
> > index 5b1e82ebc9b..956dd0a7d0d 100644
> > --- a/dlls/wineqtdecoder/qtsplitter.c
> > +++ b/dlls/wineqtdecoder/qtsplitter.c
> > @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE
> >      QTSplitter *filter = impl_from_strmbase_filter(iface);
> >      HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr;
> > - EnterCriticalSection(&This->csReceive);
> > - EnterCriticalSection(&filter->csReceive);
>
> Wouldn't the original commit have failed to compile on all platforms?
>
> Where is the This variable defined?

wineqtdecoder is only built and used on macOS.