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

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

Austin English : advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: acdedf4f0cc9bc877d12a0309bce7b9624cafa58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acdedf4f0cc9bc877d12a030… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 7 17:19:43 2019 +0100 advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41591 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/registry.c | 30 ++++++++++++++++++++++ .../api-ms-win-core-registry-l1-1-0.spec | 4 +-- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 4 +-- dlls/kernelbase/kernelbase.spec | 4 +-- include/winreg.h | 7 +++++ 6 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e996bd2..dd4102e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -648,8 +648,8 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) @ stdcall RegGetValueA(long str str long ptr ptr ptr) @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) -# @ stub RegLoadAppKeyA -# @ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) +@ stdcall RegLoadAppKeyW(wstr ptr long long long) @ stdcall RegLoadKeyA(long str str) @ stdcall RegLoadKeyW(long wstr wstr) @ stdcall RegLoadMUIStringA(long str str long ptr long str) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 14604e0..9a4c961 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3514,3 +3514,33 @@ LONG WINAPI RegDisableReflectionKey(HKEY base) FIXME("%p: stub\n", base); return ERROR_SUCCESS; } + +/****************************************************************************** + * RegLoadAppKeyA [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved) +{ + FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_a(file), result, sam, options, reserved); + + if (!file || reserved) + return ERROR_INVALID_PARAMETER; + + *result = (HKEY)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * RegLoadAppKeyW [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved) +{ + FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_w(file), result, sam, options, reserved); + + if (!file || reserved) + return ERROR_INVALID_PARAMETER; + + *result = (HKEY)0xdeadbeef; + return ERROR_SUCCESS; +} diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec index 7a48e3b..f81f027 100644 --- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec +++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec @@ -17,8 +17,8 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW -@ stub RegLoadAppKeyA -@ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA +@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 5bdad41..b2dcc17 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -102,8 +102,8 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW -@ stub RegLoadAppKeyA -@ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA +@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9a014b2..c43ccce 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1288,8 +1288,8 @@ # @ stub RegKrnResetAppKeyLoaded # @ stub RegKrnSetDllHasThreadStateGlobal # @ stub RegKrnSetTermsrvRegistryExtensionFlags -# @ stub RegLoadAppKeyA -# @ stub RegLoadAppKeyW +@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA +@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW @ stdcall -private RegLoadKeyA(long str str) kernel32.RegLoadKeyA @ stdcall -private RegLoadKeyW(long wstr wstr) kernel32.RegLoadKeyW @ stdcall -private RegLoadMUIStringA(long str str long ptr long str) kernel32.RegLoadMUIStringA diff --git a/include/winreg.h b/include/winreg.h index 51e9f02..45057df 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -84,6 +84,10 @@ typedef LONG LSTATUS; #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29) +#define REG_PROCESS_APPKEY 0x00000001 + +#define REG_MUI_STRING_TRUNCATE 0x00000001 + WINADVAPI BOOL WINAPI AbortSystemShutdownA(LPSTR); WINADVAPI BOOL WINAPI AbortSystemShutdownW(LPWSTR); #define AbortSystemShutdown WINELIB_NAME_AW(AbortSystemShutdown) @@ -133,6 +137,9 @@ WINADVAPI LSTATUS WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY WINADVAPI LSTATUS WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); WINADVAPI LSTATUS WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); #define RegGetValue WINELIB_NAME_AW(RegGetValue) +WINADVAPI LSTATUS WINAPI RegLoadAppKeyA(const char*,HKEY*,REGSAM,DWORD,DWORD); +WINADVAPI LSTATUS WINAPI RegLoadAppKeyW(const WCHAR*,HKEY*,REGSAM,DWORD,DWORD); +#define RegLoadAppKey WINELIB_NAME_AW(RegLoadAppKey) WINADVAPI LSTATUS WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); WINADVAPI LSTATUS WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); #define RegLoadKey WINELIB_NAME_AW(RegLoadKey)

1 0

Lass Safin : krnl386.exe: Add comment explaining what ZeroBits argument of NtMapViewOfSection is for.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: e61d7bbfbc10b171426818e1e643be1547d56830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61d7bbfbc10b171426818e1… Author: Lass Safin <las(a)protonmail.ch> Date: Mon Mar 4 20:27:52 2019 +0100 krnl386.exe: Add comment explaining what ZeroBits argument of NtMapViewOfSection is for. Signed-off-by: Lass Safin <las(a)protonmail.ch> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/vxd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index e103b96..88d43c2 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -1494,7 +1494,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context ) * HANDLE32 SectionHandle [in] Section to be mapped * DWORD ProcessHandle [in] Process to be mapped into * DWORD * BaseAddress [in/out] Address to be mapped at - * DWORD ZeroBits [in] (?? unclear ??) + * DWORD ZeroBits [in] Upper address bits that should be null, starting from bit 31 * DWORD CommitSize [in] (?? unclear ??) * LARGE_INTEGER *SectionOffset [in] Offset within section * DWORD * ViewSize [in] Size of view

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 42683dd159385ed2f83fa6d9a8b73ed8b64e04e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42683dd159385ed2f83fa6d9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Mar 19 21:25:32 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 260 ++++++++++++++++++--------------------------------------------- 1 file changed, 72 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42683dd159385ed2f83f…

1 0

Nikolay Sivov : mfreadwrite: Forward GetPresentationAttribute() to descriptor when appropriate.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 9dd9602d8c77d2318ff9c8361b9443ea50ec1e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd9602d8c77d2318ff9c836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:32 2019 +0300 mfreadwrite: Forward GetPresentationAttribute() to descriptor when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index eca6075..88482f7 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -317,8 +317,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface } else { - FIXME("Unsupported source attribute %s.\n", debugstr_guid(guid)); - return E_NOTIMPL; + return IMFPresentationDescriptor_GetItem(reader->descriptor, guid, value); } break; default:

1 0

Nikolay Sivov : mfreadwrite: Implement GetServiceForStream() for media source.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 160b4093cfb97d837d19bd8c2cdf826cfa4ffc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=160b4093cfb97d837d19bd8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:33 2019 +0300 mfreadwrite: Implement GetServiceForStream() for media source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 88482f7..3dac3e4 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "ole2.h" #include "rpcproxy.h" @@ -288,9 +287,39 @@ static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWORD index, REFGUID service, REFIID riid, void **object) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %s, %s, %p\n", This, index, debugstr_guid(service), debugstr_guid(riid), object); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + IUnknown *obj = NULL; + HRESULT hr; + + TRACE("%p, %#x, %s, %s, %p\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + + switch (index) + { + case MF_SOURCE_READER_MEDIASOURCE: + obj = (IUnknown *)reader->source; + break; + default: + FIXME("Unsupported index %#x.\n", index); + return E_NOTIMPL; + } + + if (IsEqualGUID(service, &GUID_NULL)) + { + hr = IUnknown_QueryInterface(obj, riid, object); + } + else + { + IMFGetService *gs; + + hr = IUnknown_QueryInterface(obj, &IID_IMFGetService, (void **)&gs); + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, service, riid, object); + IMFGetService_Release(gs); + } + } + + return hr; } static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface, DWORD index,

1 0

Nikolay Sivov : mfreadwrite: Determine first streams on reader creation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 79b37c8aa0d1419794f565aeac8a492a708326bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=79b37c8aa0d1419794f565ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:34 2019 +0300 mfreadwrite: Determine first streams on reader creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3dac3e4..2d6b7a0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -30,6 +30,8 @@ #undef INITGUID #include <guiddef.h> +#include "mfapi.h" +#include "mferror.h" #include "mfidl.h" #include "mfreadwrite.h" @@ -77,6 +79,8 @@ typedef struct source_reader LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; + DWORD first_audio_stream_index; + DWORD first_video_stream_index; } srcreader; struct sink_writer @@ -374,6 +378,40 @@ struct IMFSourceReaderVtbl srcreader_vtbl = src_reader_GetPresentationAttribute }; +static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major) +{ + unsigned int count, i; + BOOL selected; + HRESULT hr; + GUID guid; + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorCount(descriptor, &count))) + return MF_SOURCE_READER_INVALID_STREAM_INDEX; + + for (i = 0; i < count; ++i) + { + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + + if (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, i, &selected, &sd))) + { + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (SUCCEEDED(hr)) + { + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + IMFMediaTypeHandler_Release(handler); + if (SUCCEEDED(hr) && IsEqualGUID(&guid, major)) + { + return i; + } + } + } + } + + return MF_SOURCE_READER_INVALID_STREAM_INDEX; +} + static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, REFIID riid, void **out) { @@ -393,6 +431,16 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + /* At least one major type has to be set. */ + object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); + object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); + + if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && + object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) + { + hr = MF_E_ATTRIBUTENOTFOUND; + } + if (FAILED(hr = IMFMediaSource_BeginGetEvent(object->source, &object->source_events_callback, (IUnknown *)object->source))) {

1 0

Nikolay Sivov : mfreadwrite: Implement stream selection methods for source reader.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: f939fde87428f36750567d9f76352465620e06be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f939fde87428f36750567d9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:35 2019 +0300 mfreadwrite: Implement stream selection methods 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 | 68 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 2d6b7a0..14c9dfa 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -229,16 +229,72 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %p\n", This, index, selected); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + IMFStreamDescriptor *sd; + + TRACE("%p, %#x, %p.\n", iface, index, selected); + + switch (index) + { + 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: + ; + } + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, selected, &sd))) + return MF_E_INVALIDSTREAMNUMBER; + IMFStreamDescriptor_Release(sd); + + return S_OK; } static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL selected) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %d\n", This, index, selected); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + unsigned int count; + HRESULT hr; + + TRACE("%p, %#x, %d.\n", iface, index, selected); + + switch (index) + { + 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; + case MF_SOURCE_READER_ALL_STREAMS: + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(reader->descriptor, &count))) + return hr; + + for (index = 0; index < count; ++index) + { + if (selected) + IMFPresentationDescriptor_SelectStream(reader->descriptor, index); + else + IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); + } + + return S_OK; + default: + ; + } + + if (selected) + hr = IMFPresentationDescriptor_SelectStream(reader->descriptor, index); + else + hr = IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); + + if (FAILED(hr)) + return MF_E_INVALIDSTREAMNUMBER; + + return S_OK; } static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD typeindex,

1 0

Nikolay Sivov : mfreadwrite: Implement GetNativeMediaType() for source reader.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 04c8a756d69734bcb68fcae369c7d056a5f68225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c8a756d69734bcb68fcae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:36 2019 +0300 mfreadwrite: Implement GetNativeMediaType() 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 | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 14c9dfa..cbaad16 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -297,12 +297,44 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR return S_OK; } -static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD typeindex, +static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD type_index, IMFMediaType **type) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %d, %p\n", This, index, typeindex, type); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + BOOL selected; + HRESULT hr; + + TRACE("%p, %#x, %#x, %p.\n", iface, index, type_index, type); + + switch (index) + { + 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: + ; + } + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, &selected, &sd))) + return MF_E_INVALIDSTREAMNUMBER; + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + return hr; + + if (type_index == MF_SOURCE_READER_CURRENT_TYPE_INDEX) + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + else + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, type); + IMFMediaTypeHandler_Release(handler); + + return hr; } static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type)

1 0

Józef Kucia : winevulkan: Update vk.xml to 1.1.104.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 3e4189e3ada939ff3873c6d76b17fb4b858330a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4189e3ada939ff3873c6d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 15:59:31 2019 +0100 winevulkan: Update vk.xml to 1.1.104. 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 | 17 +- dlls/winevulkan/vulkan_thunks.c | 35 +- dlls/winevulkan/vulkan_thunks.h | 15 +- dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 2219 +++++++++++++++++++++------------------ include/wine/vulkan_driver.h | 2 +- 7 files changed, 1249 insertions(+), 1043 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e4189e3ada939ff3873…

1 0