From: Rémi Bernon rbernon@codeweavers.com
--- dlls/mfsrcsnk/media_source.c | 2 +- dlls/winedmo/main.c | 12 ++++++------ dlls/winedmo/winedmo.spec | 2 +- include/wine/winedmo.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/mfsrcsnk/media_source.c b/dlls/mfsrcsnk/media_source.c index a4cc2a92c31..7f79c87b3db 100644 --- a/dlls/mfsrcsnk/media_source.c +++ b/dlls/mfsrcsnk/media_source.c @@ -588,7 +588,7 @@ static HRESULT media_source_async_create(struct media_source *source, IMFAsyncRe source->winedmo_stream.p_seek = media_source_seek_cb; source->winedmo_stream.p_read = media_source_read_cb;
- if ((status = winedmo_demuxer_create(source->url, &source->winedmo_stream, &source->file_size, &source->duration, + if ((status = winedmo_demuxer_create(source->url, &source->winedmo_stream, source->file_size, &source->duration, &source->stream_count, source->mime_type, &source->winedmo_demuxer))) { WARN("Failed to create demuxer, status %#lx\n", status); diff --git a/dlls/winedmo/main.c b/dlls/winedmo/main.c index 7d30c31d05d..0751337659a 100644 --- a/dlls/winedmo/main.c +++ b/dlls/winedmo/main.c @@ -24,13 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmo);
-static struct stream_context *stream_context_create( struct winedmo_stream *stream, UINT64 *stream_size ) +static struct stream_context *stream_context_create( struct winedmo_stream *stream, UINT64 stream_size ) { struct stream_context *context;
if (!(context = malloc( 0x10000 ))) return NULL; context->stream = (UINT_PTR)stream; - context->length = *stream_size; + context->length = stream_size; context->position = 0; context->buffer_size = 0x10000 - offsetof(struct stream_context, buffer);
@@ -126,7 +126,7 @@ NTSTATUS CDECL winedmo_demuxer_check( const char *mime_type ) return status; }
-NTSTATUS CDECL winedmo_demuxer_create( const WCHAR *url, struct winedmo_stream *stream, UINT64 *stream_size, INT64 *duration, +NTSTATUS CDECL winedmo_demuxer_create( const WCHAR *url, struct winedmo_stream *stream, UINT64 stream_size, INT64 *duration, UINT *stream_count, WCHAR *mime_type, struct winedmo_demuxer *demuxer ) { struct demuxer_create_params params = {0}; @@ -135,7 +135,7 @@ NTSTATUS CDECL winedmo_demuxer_create( const WCHAR *url, struct winedmo_stream * UINT len;
TRACE( "url %s, stream %p, stream_size %#I64x, mime_type %p, demuxer %p\n", debugstr_w(url), - stream, *stream_size, mime_type, demuxer ); + stream, stream_size, mime_type, demuxer );
if (!(params.context = stream_context_create( stream, stream_size ))) return STATUS_NO_MEMORY;
@@ -158,8 +158,8 @@ NTSTATUS CDECL winedmo_demuxer_create( const WCHAR *url, struct winedmo_stream * *stream_count = params.stream_count; MultiByteToWideChar( CP_ACP, 0, params.mime_type, -1, mime_type, 256 ); *demuxer = params.demuxer; - TRACE( "created demuxer %#I64x, stream %p, stream_size %#I64x, duration %I64d, stream_count %u, mime_type %s\n", - demuxer->handle, stream, *stream_size, params.duration, params.stream_count, debugstr_a(params.mime_type) ); + TRACE( "created demuxer %#I64x, stream %p, duration %I64d, stream_count %u, mime_type %s\n", + demuxer->handle, stream, params.duration, params.stream_count, debugstr_a(params.mime_type) ); return STATUS_SUCCESS; }
diff --git a/dlls/winedmo/winedmo.spec b/dlls/winedmo/winedmo.spec index 8038312d942..3e9cc721f56 100644 --- a/dlls/winedmo/winedmo.spec +++ b/dlls/winedmo/winedmo.spec @@ -1,4 +1,4 @@ @ cdecl winedmo_demuxer_check(str) @ cdecl winedmo_demuxer_create(wstr ptr ptr ptr ptr ptr ptr) @ cdecl winedmo_demuxer_destroy(ptr) -@ cdecl winedmo_demuxer_stream_type(int64 ptr ptr) +@ cdecl winedmo_demuxer_stream_type(int64 long ptr ptr) diff --git a/include/wine/winedmo.h b/include/wine/winedmo.h index cdcd77f5dd0..7f9fb08bebd 100644 --- a/include/wine/winedmo.h +++ b/include/wine/winedmo.h @@ -43,7 +43,7 @@ struct winedmo_stream struct winedmo_demuxer { UINT64 handle; };
NTSTATUS CDECL winedmo_demuxer_check( const char *mime_type ); -NTSTATUS CDECL winedmo_demuxer_create( const WCHAR *url, struct winedmo_stream *stream, UINT64 *stream_size, INT64 *duration, +NTSTATUS CDECL winedmo_demuxer_create( const WCHAR *url, struct winedmo_stream *stream, UINT64 stream_size, INT64 *duration, UINT *stream_count, WCHAR *mime_type, struct winedmo_demuxer *demuxer ); NTSTATUS CDECL winedmo_demuxer_destroy( struct winedmo_demuxer *demuxer ); NTSTATUS CDECL winedmo_demuxer_stream_type( struct winedmo_demuxer demuxer, UINT stream,