March 2019 - Wine-Commits - list.winehq.org

Derek Lesho : ntdll: Fix unwinding from leaf function on x86_64.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: 3d0cf846f9a2cef078c7c28c60e83334b9bf5f12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d0cf846f9a2cef078c7c28c… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Mar 15 15:27:59 2019 -0400 ntdll: Fix unwinding from leaf function on x86_64. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 54871b8..21e7098 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4232,7 +4232,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec new_context.Rip = *(ULONG64 *)context->Rsp; new_context.Rsp = context->Rsp + sizeof(ULONG64); - dispatch.EstablisherFrame = new_context.Rsp; + dispatch.EstablisherFrame = context->Rsp; dispatch.LanguageHandler = NULL; unwind_done:

1 0

Alexandre Julliard : winebuild: List stubs in the import library .def files.
by Alexandre Julliard March 20, 2019

March 20, 2019

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

Jacek Caban : jscript: Support undefined context value in Array.prototype.map.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: 8be931623a36694fbc51280c322fa8434844a430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be931623a36694fbc51280c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 20 17:41:31 2019 +0100 jscript: Support undefined context value in Array.prototype.map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 5 +++-- dlls/mshtml/tests/es5.js | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 0c54fc0..a5acfdf 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1074,11 +1074,12 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned callback = get_object(argv[0]); if(argc > 1) { - if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + if(is_object_instance(argv[1]) && get_object(argv[1])) { + context_this = get_object(argv[1]); + }else if(!is_undefined(argv[1])) { FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); return E_NOTIMPL; } - context_this = get_object(argv[1]); } hres = create_array(ctx, length, &array); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8e5b846..7afdf97 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -178,6 +178,13 @@ function test_array_map() { ok(calls === "0:1,1:3,2:5,", "calls = " + calls); ok(m.join() === "0,2,4", "m = " + m); + [1,2].map(function() { + ok(this === window, "this != window"); + }); + [1,2].map(function() { + ok(this === window, "this != window"); + }, undefined); + next_test(); }

1 0

Nikolay Sivov : mfreadwrite: Add partial implementation of SetCurrentPosition() for source reader.
by Alexandre Julliard March 20, 2019

March 20, 2019

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

Alexandre Julliard : winebuild: Set the import hint based on the name index.
by Alexandre Julliard March 20, 2019

March 20, 2019

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

Józef Kucia : winevulkan: Implement VK_KHR_external_fence_capabilities.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: 57bb5cce75aed1cb06172cc0b6b696dfb008e7c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57bb5cce75aed1cb06172cc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:33 2019 +0100 winevulkan: Implement VK_KHR_external_fence_capabilities. We don't support any handle type yet. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 7 +++++-- dlls/winevulkan/vulkan.c | 18 ++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 3 +++ dlls/winevulkan/vulkan_thunks.h | 2 ++ dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 6 ++++++ 7 files changed, 36 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57bb5cce75aed1cb0617…

1 0

Nikolay Sivov : mfplat: Add event attributes guids.
by Alexandre Julliard March 20, 2019

March 20, 2019

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

Józef Kucia : winevulkan: Enable Vulkan 1.1.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: ccfdf651d1db43b1fa80fd3c47c64311687754a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccfdf651d1db43b1fa80fd3c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:37 2019 +0100 winevulkan: Enable Vulkan 1.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d54cb06..20643fa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -65,7 +65,7 @@ LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) VK_XML_VERSION = "1.1.104" -WINE_VK_VERSION = (1, 0) +WINE_VK_VERSION = (1, 1) # Filenames to create. WINE_VULKAN_H = "../../include/wine/vulkan.h" diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 4e14ac7..6d0ed45 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -38,7 +38,7 @@ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H -#define WINE_VK_VERSION VK_API_VERSION_1_0 +#define WINE_VK_VERSION VK_API_VERSION_1_1 /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers);

1 0

Józef Kucia : winevulkan: Convert VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo chain.
by Alexandre Julliard March 20, 2019

March 20, 2019

Module: wine Branch: master Commit: ec8a3a78b8219b167fffa9e0108eb67f56e8aec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8a3a78b8219b167fffa9e0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:39 2019 +0100 winevulkan: Convert VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo chain. We should teach make_vulkan to handle pNext chains... Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 635c6a9..f86064c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -207,6 +207,20 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +static void *convert_VkPhysicalDeviceFeatures2(const void *src) +{ + const VkPhysicalDeviceFeatures2 *in = src; + VkPhysicalDeviceFeatures2 *out; + + if (!(out = heap_alloc(sizeof(*out)))) + return NULL; + + *out = *in; + out->pNext = NULL; + + return out; +} + static void *convert_VkDeviceGroupDeviceCreateInfo(const void *src) { const VkDeviceGroupDeviceCreateInfo *in = src; @@ -248,12 +262,15 @@ static void *convert_VkPhysicalDeviceHostQueryResetFeaturesEXT(const void *src) static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) { VkPhysicalDeviceHostQueryResetFeaturesEXT *host_query_reset_features; + VkPhysicalDeviceFeatures2 *device_features; VkDeviceGroupDeviceCreateInfo *group_info; + device_features = wine_vk_find_struct(create_info, PHYSICAL_DEVICE_FEATURES_2); group_info = wine_vk_find_struct(create_info, DEVICE_GROUP_DEVICE_CREATE_INFO); host_query_reset_features = wine_vk_find_struct(create_info, PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT); create_info->pNext = NULL; + heap_free(device_features); if (group_info) { heap_free((void *)group_info->pPhysicalDevices); @@ -296,6 +313,12 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src dst_header = dst_header->pNext; break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2: + if (!(dst_header->pNext = convert_VkPhysicalDeviceFeatures2(header))) + goto err; + dst_header = dst_header->pNext; + break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT: if (!(dst_header->pNext = convert_VkPhysicalDeviceHostQueryResetFeaturesEXT(header))) goto err;

1 0

Nikolay Sivov : mfreadwrite: Forward remaining indices in GetPresentationAttribute() to stream descriptors.
by Alexandre Julliard March 20, 2019

March 20, 2019

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