[PATCH] amstream: Return MS_S_ENDOFSTREAM in IDirectDrawStreamSampleImpl_Update.

[Anastasios Simeonidis]

Applications test the return value of the 'Update' function to check
if a media stream is still playing. Returning S_OK results in a
deadlock on these applications. Return MS_S_ENDOFSTREAM to signal
the application that no video is playing.

Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr>
---
 dlls/amstream/mediastream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index bc61597502..5b9e8e4898 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -1281,7 +1281,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample
 {
     FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data);
 
-    return S_OK;
+    return MS_S_ENDOFSTREAM;
 }
 
 static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds)
-- 
2.19.2

[Zebediah Figura]

On 11/29/2018 05:12 PM, Anastasios Simeonidis wrote:
> Applications test the return value of the 'Update' function to check
> if a media stream is still playing. Returning S_OK results in a
> deadlock on these applications. Return MS_S_ENDOFSTREAM to signal
> the application that no video is playing.
>
> Signed-off-by: Anastasios Simeonidis <symeonidis(a)csd.auth.gr>
> ---
>   dlls/amstream/mediastream.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
> index bc61597502..5b9e8e4898 100644
> --- a/dlls/amstream/mediastream.c
> +++ b/dlls/amstream/mediastream.c
> @@ -1281,7 +1281,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample
>   {
>       FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data);
>
> -    return S_OK;
> +    return MS_S_ENDOFSTREAM;
>   }
>
> static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds)

This looks good to me in principle, but I'd like to be sure that this 
doesn't break whatever 65989f2a was meant to fix.

Andrey, do you recall what application that was?