wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Alexandre Julliard : winedump: Also print the thunk address for ordinal imports.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: d945c1ea0e338d6422c7794404d6f1ed5376230b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d945c1ea0e338d6422c77944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 20 12:48:27 2019 +0100 winedump: Also print the thunk address for ordinal imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f8689f7..bbfd296 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1193,14 +1193,14 @@ static void dump_image_thunk_data64(const IMAGE_THUNK_DATA64 *il, DWORD thunk_rv for (; il->u1.Ordinal; il++, thunk_rva += sizeof(LONGLONG)) { if (IMAGE_SNAP_BY_ORDINAL64(il->u1.Ordinal)) - printf(" %4u <by ordinal>\n", (DWORD)IMAGE_ORDINAL64(il->u1.Ordinal)); + printf(" %08x %4u <by ordinal>\n", thunk_rva, (DWORD)IMAGE_ORDINAL64(il->u1.Ordinal)); else { iibn = RVA((DWORD)il->u1.AddressOfData, sizeof(DWORD)); if (!iibn) printf("Can't grab import by name info, skipping to next ordinal\n"); else - printf(" %4u %s %x\n", iibn->Hint, iibn->Name, thunk_rva); + printf(" %08x %4u %s\n", thunk_rva, iibn->Hint, iibn->Name); } } } @@ -1211,14 +1211,14 @@ static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il, int offset, DW for (; il->u1.Ordinal; il++, thunk_rva += sizeof(DWORD)) { if (IMAGE_SNAP_BY_ORDINAL32(il->u1.Ordinal)) - printf(" %4u <by ordinal>\n", IMAGE_ORDINAL32(il->u1.Ordinal)); + printf(" %08x %4u <by ordinal>\n", thunk_rva, IMAGE_ORDINAL32(il->u1.Ordinal)); else { iibn = RVA((DWORD)il->u1.AddressOfData - offset, sizeof(DWORD)); if (!iibn) printf("Can't grab import by name info, skipping to next ordinal\n"); else - printf(" %4u %s %x\n", iibn->Hint, iibn->Name, thunk_rva); + printf(" %08x %4u %s\n", thunk_rva, iibn->Hint, iibn->Name); } } } @@ -1245,7 +1245,7 @@ static void dump_dir_imported_functions(void) printf(" ForwarderChain: %08X\n", importDesc->ForwarderChain); printf(" First thunk RVA: %08X\n", (DWORD)importDesc->FirstThunk); - printf(" Ordn Name\n"); + printf(" Thunk Ordn Name\n"); il = (importDesc->u.OriginalFirstThunk != 0) ? RVA((DWORD)importDesc->u.OriginalFirstThunk, sizeof(DWORD)) : @@ -1335,7 +1335,7 @@ static void dump_dir_delay_imported_functions(void) printf(" TimeDateStamp: %08X (%s)\n", importDesc->TimeDateStamp, get_time_str(importDesc->TimeDateStamp)); - printf(" Ordn Name\n"); + printf(" Thunk Ordn Name\n"); il = RVA(importDesc->ImportNameTableRVA - offset, sizeof(DWORD));

1 0

Alexandre Julliard : winebuild: List stubs in the import library .def files.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 32b365c9c532cff7c4db03fd347434b57a23dcf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b365c9c532cff7c4db03fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 20 12:33:14 2019 +0100 winebuild: List stubs in the import library .def files. This way we have the full list of names to compute ordinal hints. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/spec32.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e9ef52b..49473c7 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -308,7 +308,7 @@ extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_spec32_file( DLLSPEC *spec ); extern void output_pe_module( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); -extern void output_def_file( DLLSPEC *spec, int include_private ); +extern void output_def_file( DLLSPEC *spec, int include_stubs ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); extern void output_bin_res16_data( DLLSPEC *spec ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index b4512f6..04af291 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -934,7 +934,7 @@ void output_fake_module( DLLSPEC *spec ) * * Build a Win32 def file from a spec file. */ -void output_def_file( DLLSPEC *spec, int include_private ) +void output_def_file( DLLSPEC *spec, int include_stubs ) { DLLSPEC *spec32 = NULL; const char *name; @@ -961,16 +961,14 @@ void output_def_file( DLLSPEC *spec, int include_private ) for (i = total = 0; i < spec->nb_entry_points; i++) { const ORDDEF *odp = &spec->entry_points[i]; - int is_data = 0; + int is_data = 0, is_private = odp->flags & FLAG_PRIVATE; if (odp->name) name = odp->name; else if (odp->export_name) name = odp->export_name; else continue; - if (!(odp->flags & FLAG_PRIVATE)) total++; - else if (!include_private) continue; - - if (odp->type == TYPE_STUB) continue; + if (!is_private) total++; + if (!include_stubs && odp->type == TYPE_STUB) continue; output( " %s", name ); @@ -995,13 +993,17 @@ void output_def_file( DLLSPEC *spec, int include_private ) output( "=%s", get_link_name( odp )); break; } + case TYPE_STUB: + if (!kill_at && target_cpu == CPU_x86) output( "@%d", get_args_size( odp )); + is_private = 1; + break; default: assert(0); } output( " @%d", odp->ordinal ); if (!odp->name || (odp->flags & FLAG_ORDINAL)) output( " NONAME" ); if (is_data) output( " DATA" ); - if (odp->flags & FLAG_PRIVATE) output( " PRIVATE" ); + if (is_private) output( " PRIVATE" ); output( "\n" ); } if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name );

1 0

Alexandre Julliard : winebuild: Set the import hint based on the name index.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 074ec5844bdd351d83aebfd90a14a68972079f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=074ec5844bdd351d83aebfd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 20 11:49:38 2019 +0100 winebuild: Set the import hint based on the name index. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 13 ++++++++----- tools/winebuild/parser.c | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 603b6e2..e9ef52b 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -98,6 +98,7 @@ typedef struct { ORD_TYPE type; int ordinal; + int hint; int lineno; int flags; char *name; /* public name of this function */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 984bffd..8838769 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -43,6 +43,7 @@ struct import_func const char *name; const char *export_name; int ordinal; + int hint; }; struct import @@ -332,7 +333,8 @@ struct import *add_static_import_dll( const char *name ) } /* add a function to the list of imports from a given dll */ -static void add_import_func( struct import *imp, const char *name, const char *export_name, int ordinal ) +static void add_import_func( struct import *imp, const char *name, const char *export_name, + int ordinal, int hint ) { if (imp->nb_imports == imp->max_imports) { @@ -343,6 +345,7 @@ static void add_import_func( struct import *imp, const char *name, const char *e imp->imports[imp->nb_imports].name = name; imp->imports[imp->nb_imports].export_name = export_name; imp->imports[imp->nb_imports].ordinal = ordinal; + imp->imports[imp->nb_imports].hint = hint; imp->nb_imports++; } @@ -361,9 +364,9 @@ static void add_undef_import( const char *name, int is_ordinal ) import = add_static_import_dll( dll_name ); if (is_ordinal) - add_import_func( import, NULL, xstrdup( p ), ordinal ); + add_import_func( import, NULL, xstrdup( p ), ordinal, 0 ); else - add_import_func( import, xstrdup( p ), NULL, ordinal ); + add_import_func( import, xstrdup( p ), NULL, ordinal, 0 ); } /* get the default entry point for a given spec file */ @@ -587,7 +590,7 @@ void resolve_dll_imports( DLLSPEC *spec, struct list *list ) else { add_import_func( imp, (odp->flags & FLAG_NONAME) ? NULL : odp->name, - odp->export_name, odp->ordinal ); + odp->export_name, odp->ordinal, odp->hint ); remove_name( &undef_symbols, j-- ); } } @@ -769,7 +772,7 @@ static void output_immediate_imports(void) if (!func->name) continue; output( "\t.align %d\n", get_alignment(2) ); output( ".L__wine_spec_import_data_%s_%s:\n", import->c_name, func->name ); - output( "\t.short %d\n", func->ordinal ); + output( "\t.short %d\n", func->hint ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), func->name ); } } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index dfb7f6f..ea9e939 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -756,6 +756,7 @@ static void assign_names( DLLSPEC *spec ) /* sort the list of names */ qsort( spec->names, spec->nb_names, sizeof(spec->names[0]), name_compare ); + for (i = 0; i < spec->nb_names; i++) spec->names[i]->hint = i; } }

1 0

Nikolay Sivov : mfreadwrite: Add partial implementation of SetCurrentPosition() for source reader.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: d6acb0edb84101c1c6caf440c6837f1b86b4a12a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6acb0edb84101c1c6caf440… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:43 2019 +0300 mfreadwrite: Add partial implementation of SetCurrentPosition() for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 18 +++++++++++++++--- include/mfidl.idl | 12 ++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index ef9e06e..516b592 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -359,9 +359,21 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFGUID format, REFPROPVARIANT position) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(format), position); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + DWORD flags; + HRESULT hr; + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), position); + + /* FIXME: fail if we got pending samples. */ + + if (FAILED(hr = IMFMediaSource_GetCharacteristics(reader->source, &flags))) + return hr; + + if (!(flags & MFMEDIASOURCE_CAN_SEEK)) + return MF_E_INVALIDREQUEST; + + return IMFMediaSource_Start(reader->source, reader->descriptor, format, position); } static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, diff --git a/include/mfidl.idl b/include/mfidl.idl index 6a958a9..944f8f9 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -425,6 +425,18 @@ cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") +typedef enum _MFMEDIASOURCE_CHARACTERISTICS +{ + MFMEDIASOURCE_IS_LIVE = 0x1, + MFMEDIASOURCE_CAN_SEEK = 0x2, + MFMEDIASOURCE_CAN_PAUSE = 0x4, + MFMEDIASOURCE_HAS_SLOW_SEEK = 0x8, + MFMEDIASOURCE_HAS_MULTIPLE_PRESENTATIONS = 0x10, + MFMEDIASOURCE_CAN_SKIPFORWARD = 0x20, + MFMEDIASOURCE_CAN_SKIPBACKWARD = 0x40, + MFMEDIASOURCE_DOES_NOT_USE_NETWORK = 0x80, +} MFMEDIASOURCE_CHARACTERISTICS; + [ object, uuid(279a808d-aec7-40c8-9c6b-a6b492c78a66),

1 0

Nikolay Sivov : mfreadwrite: Forward remaining indices in GetPresentationAttribute() to stream descriptors.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: ca84c6e82e4937e757bbc0bf11a09439fa920d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca84c6e82e4937e757bbc0bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:42 2019 +0300 mfreadwrite: Forward remaining indices in GetPresentationAttribute() to stream descriptors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6b8989c..ef9e06e 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -423,6 +423,8 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface REFGUID guid, PROPVARIANT *value) { struct source_reader *reader = impl_from_IMFSourceReader(iface); + IMFStreamDescriptor *sd; + BOOL selected; HRESULT hr; TRACE("%p, %#x, %s, %p.\n", iface, index, debugstr_guid(guid), value); @@ -446,12 +448,23 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface return IMFPresentationDescriptor_GetItem(reader->descriptor, guid, value); } break; + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; default: - FIXME("Unsupported index %#x.\n", index); - return E_NOTIMPL; + ; } - return E_NOTIMPL; + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, &selected, &sd))) + return hr; + + hr = IMFStreamDescriptor_GetItem(sd, guid, value); + IMFStreamDescriptor_Release(sd); + + return hr; } struct IMFSourceReaderVtbl srcreader_vtbl =

1 0

Nikolay Sivov : mfplat: Add event attributes guids.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 282510377089137269a3725dfb13fea18f26f534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=282510377089137269a3725d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:41 2019 +0300 mfplat: Add event attributes guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 20 ++++++++++++++++++++ include/mfapi.h | 21 +++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c459e0a..ae94645 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -576,7 +576,9 @@ static const char *debugstr_attr(const GUID *guid) X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), + X(MF_EVENT_SOURCE_TOPOLOGY_CANCELED), X(MF_MT_USER_DATA), + X(MF_EVENT_STREAM_METADATA_SYSTEMID), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MFSampleExtension_Token), @@ -589,22 +591,38 @@ static const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_CONTENT_TYPE), X(MF_BYTESTREAM_DURATION), X(MF_SD_SAMI_LANGUAGE), + X(MF_EVENT_OUTPUT_NODE), X(MF_BYTESTREAM_LAST_MODIFIED_TIME), X(MF_MT_FRAME_RATE_RANGE_MIN), X(MF_BYTESTREAM_IFO_FILE_URI), + X(MF_EVENT_TOPOLOGY_STATUS), X(MF_BYTESTREAM_DLNA_PROFILE_ID), X(MF_MT_MAJOR_TYPE), + X(MF_EVENT_SOURCE_CHARACTERISTICS), + X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), X(MF_PD_ADAPTIVE_STREAMING), X(MFSampleExtension_Timestamp), X(MF_MT_SUBTYPE), X(MF_SD_MUTUALLY_EXCLUSIVE), X(MF_SD_STREAM_NAME), + X(MF_EVENT_STREAM_METADATA_CONTENT_KEYIDS), + X(MF_EVENT_STREAM_METADATA_KEYDATA), X(MF_SINK_WRITER_D3D_MANAGER), X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_EVENT_SOURCE_FAKE_START), + X(MF_EVENT_SOURCE_PROJECTSTART), + X(MF_EVENT_SOURCE_ACTUAL_START), X(MF_SOURCE_READER_ASYNC_CALLBACK), + X(MF_EVENT_SCRUBSAMPLE_TIME), X(MF_MT_INTERLACE_MODE), X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), + X(MF_EVENT_MFT_INPUT_STREAM_ID), X(MF_READWRITE_MMCSS_PRIORITY), + X(MF_EVENT_START_PRESENTATION_TIME), + X(MF_EVENT_SESSIONCAPS), + X(MF_EVENT_PRESENTATION_TIME_OFFSET), + X(MF_EVENT_SESSIONCAPS_DELTA), + X(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT), X(MFSampleExtension_DecodeTimestamp), X(MF_SINK_WRITER_DISABLE_THROTTLING), X(MF_READWRITE_D3D_OPTIONAL), @@ -613,6 +631,8 @@ static const char *debugstr_attr(const GUID *guid) X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_MT_FRAME_RATE), X(MF_SOURCE_READER_MEDIASOURCE_CONFIG), + X(MF_EVENT_MFT_CONTEXT), + X(MF_EVENT_DO_THINNING), X(MF_SOURCE_READER_DISABLE_DXVA), #undef X }; diff --git a/include/mfapi.h b/include/mfapi.h index a586991..b38953c 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -122,6 +122,27 @@ DEFINE_GUID(MFSampleExtension_DecodeTimestamp, 0x73a954d4, 0x09e2, 0x4861, 0xbe, DEFINE_GUID(MFSampleExtension_Timestamp, 0x1e436999, 0x69be, 0x4c7a, 0x93, 0x69, 0x70, 0x06, 0x8c, 0x02, 0x60, 0xcb); DEFINE_GUID(MFSampleExtension_Token, 0x8294da66, 0xf328, 0x4805, 0xb5, 0x51, 0x00, 0xde, 0xb4, 0xc5, 0x7a, 0x61); +DEFINE_GUID(MF_EVENT_DO_THINNING, 0x321ea6fb, 0xdad9, 0x46e4, 0xb3, 0x1d, 0xd2, 0xea, 0xe7, 0x09, 0x0e, 0x30); +DEFINE_GUID(MF_EVENT_MFT_CONTEXT, 0xb7cd31f1, 0x899e, 0x4b41, 0x80, 0xc9, 0x26, 0xa8, 0x96, 0xd3, 0x29, 0x77); +DEFINE_GUID(MF_EVENT_MFT_INPUT_STREAM_ID, 0xf29c2cca, 0x7ae6, 0x42d2, 0xb2, 0x84, 0xbf, 0x83, 0x7c, 0xc8, 0x74, 0xe2); +DEFINE_GUID(MF_EVENT_PRESENTATION_TIME_OFFSET, 0x5ad914d1, 0x9b45, 0x4a8d, 0xa2, 0xc0, 0x81, 0xd1, 0xe5, 0x0b, 0xfb, 0x07); +DEFINE_GUID(MF_EVENT_SCRUBSAMPLE_TIME, 0x9ac712b3, 0xdcb8, 0x44d5, 0x8d, 0x0c, 0x37, 0x45, 0x5a, 0x27, 0x82, 0xe3); +DEFINE_GUID(MF_EVENT_SESSIONCAPS, 0x7e5ebcd0, 0x11b8, 0x4abe, 0xaf, 0xad, 0x10, 0xf6, 0x59, 0x9a, 0x7f, 0x42); +DEFINE_GUID(MF_EVENT_SESSIONCAPS_DELTA, 0x7e5ebcd1, 0x11b8, 0x4abe, 0xaf, 0xad, 0x10, 0xf6, 0x59, 0x9a, 0x7f, 0x42); +DEFINE_GUID(MF_EVENT_SOURCE_ACTUAL_START, 0xa8cc55a9, 0x6b31, 0x419f, 0x84, 0x5d, 0xff, 0xb3, 0x51, 0xa2, 0x43, 0x4b); +DEFINE_GUID(MF_EVENT_SOURCE_CHARACTERISTICS, 0x47db8490, 0x8b22, 0x4f52, 0xaf, 0xda, 0x9c, 0xe1, 0xb2, 0xd3, 0xcf, 0xa8); +DEFINE_GUID(MF_EVENT_SOURCE_CHARACTERISTICS_OLD, 0x47db8491, 0x8b22, 0x4f52, 0xaf, 0xda, 0x9c, 0xe1, 0xb2, 0xd3, 0xcf, 0xa8); +DEFINE_GUID(MF_EVENT_SOURCE_FAKE_START, 0xa8cc55a7, 0x6b31, 0x419f, 0x84, 0x5d, 0xff, 0xb3, 0x51, 0xa2, 0x43, 0x4b); +DEFINE_GUID(MF_EVENT_SOURCE_PROJECTSTART, 0xa8cc55a8, 0x6b31, 0x419f, 0x84, 0x5d, 0xff, 0xb3, 0x51, 0xa2, 0x43, 0x4b); +DEFINE_GUID(MF_EVENT_SOURCE_TOPOLOGY_CANCELED, 0xdb62f650, 0x9a5e, 0x4704, 0xac, 0xf3, 0x56, 0x3b, 0xc6, 0xa7, 0x33, 0x64); +DEFINE_GUID(MF_EVENT_START_PRESENTATION_TIME, 0x5ad914d0, 0x9b45, 0x4a8d, 0xa2, 0xc0, 0x81, 0xd1, 0xe5, 0x0b, 0xfb, 0x07); +DEFINE_GUID(MF_EVENT_START_PRESENTATION_TIME_AT_OUTPUT, 0x5ad914d2, 0x9b45, 0x4a8d, 0xa2, 0xc0, 0x81, 0xd1, 0xe5, 0x0b, 0xfb, 0x07); +DEFINE_GUID(MF_EVENT_STREAM_METADATA_CONTENT_KEYIDS, 0x5063449d, 0xcc29, 0x4fc6, 0xa7, 0x5a, 0xd2, 0x47, 0xb3, 0x5a, 0xf8, 0x5c); +DEFINE_GUID(MF_EVENT_STREAM_METADATA_KEYDATA, 0xcd59a4a1, 0x4a3b, 0x4bbd, 0x86, 0x65, 0x72, 0xa4, 0x0f, 0xbe, 0xa7, 0x76); +DEFINE_GUID(MF_EVENT_STREAM_METADATA_SYSTEMID, 0x1ea2ef64, 0xba16, 0x4a36, 0x87, 0x19, 0xfe, 0x75, 0x60, 0xba, 0x32, 0xad); +DEFINE_GUID(MF_EVENT_TOPOLOGY_STATUS, 0x30c5018d, 0x9a53, 0x454b, 0xad, 0x9e, 0x6d, 0x5f, 0x8f, 0xa7, 0xc4, 0x3b); +DEFINE_GUID(MF_EVENT_OUTPUT_NODE, 0x830f1a8b, 0xc060, 0x46dd, 0xa8, 0x01, 0x1c, 0x95, 0xde, 0xc9, 0xb1, 0x07); + typedef unsigned __int64 MFWORKITEM_KEY; typedef enum

1 0

Nikolay Sivov : mfreadwrite: Add support for MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 021b0e2f68128fb0a96bf704293809ef9c7272cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=021b0e2f68128fb0a96bf704… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:40 2019 +0300 mfreadwrite: Add support for MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 15c5dbf..6b8989c 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -82,6 +82,7 @@ typedef struct source_reader DWORD first_audio_stream_index; DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; + BOOL shutdown_on_release; } srcreader; struct sink_writer @@ -220,7 +221,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { if (reader->async_callback) IMFSourceReaderCallback_Release(reader->async_callback); - IMFMediaSource_Shutdown(reader->source); + if (reader->shutdown_on_release) + IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); IMFMediaSource_Release(reader->source); @@ -504,7 +506,7 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor } static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, - REFIID riid, void **out) + BOOL shutdown_on_release, REFIID riid, void **out) { srcreader *object; HRESULT hr; @@ -573,7 +575,7 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib if (FAILED(hr)) return hr; - hr = create_source_reader_from_source(source, attributes, riid, out); + hr = create_source_reader_from_source(source, attributes, TRUE, riid, out); IMFMediaSource_Release(source); return hr; } @@ -621,7 +623,7 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at if (FAILED(hr)) return hr; - hr = create_source_reader_from_source(source, attributes, riid, out); + hr = create_source_reader_from_source(source, attributes, TRUE, riid, out); IMFMediaSource_Release(source); return hr; } @@ -828,9 +830,14 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, IMFSourceReader **reader) { + UINT32 disconnect = 0; + TRACE("%p, %p, %p.\n", source, attributes, reader); - return create_source_reader_from_source(source, attributes, &IID_IMFSourceReader, (void **)reader); + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); + + return create_source_reader_from_source(source, attributes, !disconnect, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** @@ -902,7 +909,13 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla if (stream) hr = create_source_reader_from_stream(stream, attributes, riid, out); else if (source) - hr = create_source_reader_from_source(source, attributes, riid, out); + { + UINT32 disconnect = 0; + + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); + hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); + } if (source) IMFMediaSource_Release(source);

1 0

Nikolay Sivov : mfreadwrite: Keep async callback reference for the reader.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 9e57659b7b9aa2f97c876eef435345725825b5d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e57659b7b9aa2f97c876eef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:39 2019 +0300 mfreadwrite: Keep async callback reference for the reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 7 +++++++ include/mfreadwrite.idl | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index a6e0c10..15c5dbf 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -81,6 +81,7 @@ typedef struct source_reader IMFPresentationDescriptor *descriptor; DWORD first_audio_stream_index; DWORD first_video_stream_index; + IMFSourceReaderCallback *async_callback; } srcreader; struct sink_writer @@ -217,6 +218,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (!refcount) { + if (reader->async_callback) + IMFSourceReaderCallback_Release(reader->async_callback); IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); @@ -535,6 +538,10 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri goto failed; } + if (attributes) + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, &IID_IMFSourceReaderCallback, + (void **)&object->async_callback); + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 86e6eea..0eea43b 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -90,6 +90,27 @@ cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, 0xfb cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CONFIG, 0x9085abeb, 0x0354, 0x48f9, 0xab, 0xb5, 0x20, 0x0d, 0xf8, 0x38, 0xc6, 0x8e);") +[ + object, + uuid(deec8d99-fa1d-4d82-84c2-2c8969944867), + local +] +interface IMFSourceReaderCallback : IUnknown +{ + HRESULT OnReadSample( + [in] HRESULT hr, + [in] DWORD stream_index, + [in] DWORD stream_flags, + [in] LONGLONG timestamp, + [in] IMFSample *sample); + + HRESULT OnFlush([in] DWORD stream_index); + + HRESULT OnEvent( + [in] DWORD stream_index, + [in] IMFMediaEvent *event); +} + interface IMFMediaSource; [

1 0

Nikolay Sivov : mfreadwrite: Support source configuration with MF_SOURCE_READER_MEDIASOURCE_CONFIG.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: a35ddb13b781ee4552b3428623687739651457ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35ddb13b781ee4552b34286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:38 2019 +0300 mfreadwrite: Support source configuration with MF_SOURCE_READER_MEDIASOURCE_CONFIG. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index cbaad16..a6e0c10 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -545,6 +545,7 @@ failed: static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, REFIID riid, void **out) { + IPropertyStore *props = NULL; IMFSourceResolver *resolver; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; @@ -553,9 +554,15 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib if (FAILED(hr = MFCreateSourceResolver(&resolver))) return hr; - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + if (attributes) + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore, + (void **)&props); + + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, props, &obj_type, (IUnknown **)&source); IMFSourceResolver_Release(resolver); + if (props) + IPropertyStore_Release(props); if (FAILED(hr)) return hr; @@ -566,6 +573,7 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out) { + IPropertyStore *props = NULL; IMFSourceResolver *resolver; IUnknown *object = NULL; MF_OBJECT_TYPE obj_type; @@ -575,7 +583,11 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at if (FAILED(hr = MFCreateSourceResolver(&resolver))) return hr; - hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, + if (attributes) + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore, + (void **)&props); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, props, &obj_type, &object); if (SUCCEEDED(hr)) { @@ -583,7 +595,7 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at { case MF_OBJECT_BYTESTREAM: hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, (IMFByteStream *)object, NULL, - MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&source); + MF_RESOLUTION_MEDIASOURCE, props, &obj_type, (IUnknown **)&source); break; case MF_OBJECT_MEDIASOURCE: source = (IMFMediaSource *)object; @@ -597,6 +609,8 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at } IMFSourceResolver_Release(resolver); + if (props) + IPropertyStore_Release(props); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : mfplat: Add media source attribute guids.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 999abe0f859fc6188b6c48a007c81ebbde2fdbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=999abe0f859fc6188b6c48a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:37 2019 +0300 mfplat: Add media source attribute guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 +++++++++++ include/mfreadwrite.idl | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ccd0a03..c459e0a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -556,9 +556,11 @@ static const char *debugstr_attr(const GUID *guid) #define X(g) { &(g), #g } X(MF_READWRITE_MMCSS_CLASS), X(MF_SINK_WRITER_ENCODER_CONFIG), + X(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_MT_AVG_BITRATE), + X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), X(MF_PD_TOTAL_FILE_SIZE), @@ -570,12 +572,15 @@ static const char *debugstr_attr(const GUID *guid) X(MF_MT_ALL_SAMPLES_INDEPENDENT), X(MF_PD_PREFERRED_LANGUAGE), X(MF_PD_PLAYBACK_BOUNDARY_TIME), + X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_MT_USER_DATA), + X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MFSampleExtension_Token), + X(MF_SOURCE_READER_D3D11_BIND_FLAGS), X(MF_PD_SAMI_STYLELIST), X(MF_SD_LANGUAGE), X(MF_SD_PROTECTED), @@ -595,14 +600,20 @@ static const char *debugstr_attr(const GUID *guid) X(MF_SD_MUTUALLY_EXCLUSIVE), X(MF_SD_STREAM_NAME), X(MF_SINK_WRITER_D3D_MANAGER), + X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_SOURCE_READER_ASYNC_CALLBACK), X(MF_MT_INTERLACE_MODE), + X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), X(MF_READWRITE_MMCSS_PRIORITY), X(MFSampleExtension_DecodeTimestamp), X(MF_SINK_WRITER_DISABLE_THROTTLING), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_MT_FRAME_RATE), + X(MF_SOURCE_READER_MEDIASOURCE_CONFIG), + X(MF_SOURCE_READER_DISABLE_DXVA), #undef X }; struct guid_def *ret = NULL; diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 9097b5a..86e6eea 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -78,7 +78,17 @@ cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x08 cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") -cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ASYNC_CALLBACK, 0x1e3dbeac, 0xbb43, 0x4c35, 0xb5, 0x07, 0xcd, 0x64, 0x44, 0x64, 0xc9, 0x65);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_D3D_MANAGER, 0xec822da2, 0xe1e9, 0x4b29, 0xa0, 0xd8, 0x56, 0x3c, 0x71, 0x9f, 0x52, 0x69);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_D3D11_BIND_FLAGS, 0x33f3197b, 0xf73a, 0x4e14, 0x8d, 0x85, 0x0e, 0x4c, 0x43, 0x68, 0x78, 0x8d);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS, 0x9d3365dd, 0x058f, 0x4cfb, 0x9f, 0x97, 0xb3, 0x14, 0xcc, 0x99, 0xc8, 0xad);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISABLE_DXVA, 0xaa456cfd, 0x3943, 0x4a1e, 0xa7, 0x7d, 0x18, 0x38, 0xc0, 0xea, 0x2e, 0x35);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, 0x56b67165, 0x219e, 0x456d, 0xa2, 0x2e, 0x2d, 0x30, 0x04, 0xc7, 0xfe, 0x56);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING, 0x0f81da2c, 0xb537, 0x4672, 0xa8, 0xb2, 0xa6, 0x81, 0xb1, 0x73, 0x07, 0xa3);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS, 0xdfd4f008, 0xb5fd, 0x4e78, 0xae, 0x44, 0x62, 0xa1, 0xe6, 0x7b, 0xbe, 0x27);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, 0xfb394f3d, 0xccf1, 0x42ee, 0xbb, 0xb3, 0xf9, 0xb8, 0x45, 0xd5, 0x68, 0x1d);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CONFIG, 0x9085abeb, 0x0354, 0x48f9, 0xab, 0xb5, 0x20, 0x0d, 0xf8, 0x38, 0xc6, 0x8e);") interface IMFMediaSource;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019