April 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : opengl32: Add stub for wglGetDefaultProcAddress().
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: c169bfb42829e4cc5d76be62a6eb407fdc2d003d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c169bfb42829e4cc5d76be62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:35:05 2020 +0200 opengl32: Add stub for wglGetDefaultProcAddress(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48898 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 6 ++++++ dlls/opengl32/opengl32.spec | 1 + dlls/opengl32/wgl.c | 9 +++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index cd04b34388..ebfd3c9161 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -381,6 +381,8 @@ my %remapped_wgl_functions = "wglUseFontOutlines" => 0, ); +my @extra_wgl_functions = ( "wglGetDefaultProcAddress" ); + my %supported_wgl_extensions = ( "WGL_ARB_create_context" => 1, @@ -502,6 +504,10 @@ sub parse_file($) } $wgl_functions{$name} = $functions{$cmd->{name}}; } + foreach my $name (@extra_wgl_functions) + { + $wgl_functions{$name} = $functions{$name} if defined $functions{$name}; + } } next unless defined $norm_categories{$feature->{name}}; foreach my $cmd ($feature->findnodes("./require/command")) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 4d4288cd48..94a3dfd075 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -344,6 +344,7 @@ @ stdcall wglDescribePixelFormat(long long long ptr) @ stdcall wglGetCurrentContext() @ stdcall wglGetCurrentDC() +@ stdcall wglGetDefaultProcAddress(str) @ stdcall wglGetLayerPaletteEntries(long long long long ptr) @ stdcall wglGetPixelFormat(long) @ stdcall wglGetProcAddress(str) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 008778c532..a1422fbfcd 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -949,6 +949,15 @@ int WINAPI wglSetLayerPaletteEntries(HDC hdc, return 0; } +/*********************************************************************** + * wglGetDefaultProcAddress (OPENGL32.@) + */ +PROC WINAPI wglGetDefaultProcAddress( LPCSTR name ) +{ + FIXME( "%s: stub\n", debugstr_a(name)); + return NULL; +} + /*********************************************************************** * wglSwapLayerBuffers (OPENGL32.@) */

1 0

Jacek Caban : include: Don't override keywords with macros on MSVC.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 1902eba2c611ac738a95ecab1f2495da4bb5dd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1902eba2c611ac738a95ecab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 15:40:44 2020 +0200 include: Don't override keywords with macros on MSVC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt.h | 8 ++------ include/windef.h | 32 +++++++++++++++----------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 3532cbf501..bc93de023f 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -49,7 +49,7 @@ #endif #endif -#ifndef __stdcall +#if !defined(_MSC_VER) && !defined(__stdcall) # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -57,8 +57,6 @@ # else # define __stdcall __attribute__((__stdcall__)) # endif -# elif defined(_MSC_VER) - /* Nothing needs to be done. __stdcall already exists */ # else # error You need to define __stdcall for your compiler # endif @@ -77,7 +75,7 @@ # endif /* __i386__ */ #endif /* __stdcall */ -#ifndef __cdecl +#if !defined(_MSC_VER) && !defined(__cdecl) # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) @@ -94,8 +92,6 @@ # define __cdecl __attribute__((pcs("aapcs-vfp"))) # elif defined(__aarch64__) && defined (__GNUC__) # define __cdecl __attribute__((ms_abi)) -# elif !defined(_MSC_VER) -# define __cdecl # endif #endif /* __cdecl */ diff --git a/include/windef.h b/include/windef.h index 3c61cad4c5..689163accc 100644 --- a/include/windef.h +++ b/include/windef.h @@ -50,7 +50,7 @@ extern "C" { # endif #endif -#ifndef __stdcall +#if !defined(_MSC_VER) && !defined(__stdcall) # ifdef __i386__ # ifdef __GNUC__ # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) @@ -58,8 +58,6 @@ extern "C" { # else # define __stdcall __attribute__((__stdcall__)) # endif -# elif defined(_MSC_VER) - /* Nothing needs to be done. __stdcall already exists */ # else # error You need to define __stdcall for your compiler # endif @@ -78,7 +76,7 @@ extern "C" { # endif /* __i386__ */ #endif /* __stdcall */ -#ifndef __cdecl +#if !defined(_MSC_VER) && !defined(__cdecl) # if defined(__i386__) && defined(__GNUC__) # if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) @@ -100,10 +98,8 @@ extern "C" { # endif #endif /* __cdecl */ -#ifndef __fastcall -# ifndef _MSC_VER -# define __fastcall __stdcall -# endif +#if !defined(_MSC_VER) && !defined(__fastcall) +# define __fastcall __stdcall #endif #ifndef __thiscall @@ -140,12 +136,7 @@ extern "C" { #define __ONLY_IN_WINELIB(x) x #endif -#ifndef pascal -#define pascal __ONLY_IN_WINELIB(__stdcall) -#endif -#ifndef _pascal -#define _pascal __ONLY_IN_WINELIB(__stdcall) -#endif +#ifndef _MSC_VER #ifndef _stdcall #define _stdcall __ONLY_IN_WINELIB(__stdcall) #endif @@ -155,16 +146,23 @@ extern "C" { #ifndef __fastcall #define __fastcall __ONLY_IN_WINELIB(__stdcall) #endif -#ifndef __export -#define __export __ONLY_IN_WINELIB(__stdcall) -#endif #ifndef cdecl #define cdecl __ONLY_IN_WINELIB(__cdecl) #endif #ifndef _cdecl #define _cdecl __ONLY_IN_WINELIB(__cdecl) #endif +#endif /* _MSC_VER */ +#ifndef pascal +#define pascal __ONLY_IN_WINELIB(__stdcall) +#endif +#ifndef _pascal +#define _pascal __ONLY_IN_WINELIB(__stdcall) +#endif +#ifndef __export +#define __export __ONLY_IN_WINELIB(__stdcall) +#endif #ifndef near #define near __ONLY_IN_WINELIB(/* nothing */) #endif

1 0

Jacek Caban : debug.h: Use GNU style variadic macros on MSVC clang target.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 28bc1bb463eb4075c6a113ba5c279a0506c6daea URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bc1bb463eb4075c6a113ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 16:20:36 2020 +0200 debug.h: Use GNU style variadic macros on MSVC clang target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 2a63f4351d..912d61a90a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -77,7 +77,7 @@ struct __wine_debug_channel #define __WINE_IS_DEBUG_ON(dbcl,dbch) \ (__WINE_GET_DEBUGGING##dbcl(dbch) && (__wine_dbg_get_channel_flags(dbch) & (1 << __WINE_DBCL##dbcl))) -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define __WINE_DPRINTF(dbcl,dbch) \ do { if(__WINE_GET_DEBUGGING(dbcl,(dbch))) { \

1 0

Nikolay Sivov : mf: Add missing IMFMediaEventGenerator query support for SAR stream.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 3b6699822ada81998610fbd9ccd6af98561c0356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6699822ada81998610fbd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 15:03:19 2020 +0300 mf: Add missing IMFMediaEventGenerator query support for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 1 + dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index bb3eba7eee..f883163bde 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1106,6 +1106,7 @@ static HRESULT WINAPI audio_renderer_stream_QueryInterface(IMFStreamSink *iface, TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFStreamSink) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *obj = &renderer->IMFStreamSink_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5b300cd90f..bf14ccf0fe 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2860,6 +2860,10 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); ok(hr == S_OK, "Failed to get a stream, hr %#x.\n", hr); + hr = IMFStreamSink_QueryInterface(stream_sink, &IID_IMFMediaEventGenerator, (void **)&unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFStreamSink_GetIdentifier(stream_sink, &id); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!id, "Unexpected id.\n");

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 60d7923682957f366abca8a75ac4b5510ecd6c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d7923682957f366abca8a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:31:51 2020 +0200 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 17 +++- dlls/opengl32/opengl_ext.c | 196 +++++++++++++++++++++++++++++++++++--------- dlls/opengl32/opengl_norm.c | 54 +++++++++--- include/wine/wgl.h | 51 ++++++++++-- include/wine/wgl_driver.h | 41 ++++++--- 5 files changed, 286 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60d7923682957f366abc…

1 0

Nikolay Sivov : mf: Add missing IMFMediaEventGenerator query support for sample grabber stream.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: c17994c21809303dbc98c1f71b11fbe26999f3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c17994c21809303dbc98c1f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 15:03:18 2020 +0300 mf: Add missing IMFMediaEventGenerator query support for sample grabber stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 1 + dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 1919ce6220..21f89c0ad0 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -141,6 +141,7 @@ static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFStreamSink) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || IsEqualIID(riid, &IID_IUnknown)) { *obj = &grabber->IMFStreamSink_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ae9f58a4bc..5b300cd90f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2028,6 +2028,10 @@ static void test_sample_grabber(void) hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + hr = IMFStreamSink_QueryInterface(stream, &IID_IMFMediaEventGenerator, (void **)&unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFStreamSink_GetIdentifier(stream, &id); ok(hr == S_OK, "Failed to get stream id, hr %#x.\n", hr); ok(id == 0, "Unexpected id %#x.\n", id);

1 0

Jacek Caban : windef.h: Use __thiscall keyword on Clang with MSVC target.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 3acd943275d3293df2d5159eb4238e40c1d91645 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acd943275d3293df2d5159e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 15:40:54 2020 +0200 windef.h: Use __thiscall keyword on Clang with MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windef.h | 2 +- include/wine/asm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 689163accc..436ac6afd8 100644 --- a/include/windef.h +++ b/include/windef.h @@ -102,7 +102,7 @@ extern "C" { # define __fastcall __stdcall #endif -#ifndef __thiscall +#if (!defined(_MSC_VER) || !defined(__clang__)) && !defined(__thiscall) # define __thiscall __stdcall #endif diff --git a/include/wine/asm.h b/include/wine/asm.h index 3f5a685bb6..a036744674 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -96,7 +96,7 @@ /* thiscall support */ -#if defined(__i386__) && !defined(__MINGW32__) +#if defined(__i386__) && !defined(__MINGW32__) && (!defined(_MSC_VER) || !defined(__clang__)) # ifdef _MSC_VER # define DEFINE_THISCALL_WRAPPER(func,args) \

1 0

Jacek Caban : winnt.h: Use the same C_ASSERT version on all compilers.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: b1aba79b8b31fe5b070d168014096aa6e8a00178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1aba79b8b31fe5b070d1680… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 15:48:53 2020 +0200 winnt.h: Use the same C_ASSERT version on all compilers. It works on MSCV as well. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 057f178845..c90e9052de 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -388,11 +388,7 @@ extern "C" { /* Compile time assertion */ -#if defined(_MSC_VER) -# define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] -#else -# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) -#endif +#define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200)

1 0

Zebediah Figura : qcap/filewriter: Implement file_writer_sink_query_accept().
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 98da3641d15e9de42420f599ad8172347a754699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98da3641d15e9de42420f599… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:14:08 2020 -0500 qcap/filewriter: Implement file_writer_sink_query_accept(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 10 ++++ dlls/qcap/tests/filewriter.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 656f72db1a..aa58226bd0 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -54,9 +54,19 @@ static HRESULT file_writer_sink_query_interface(struct strmbase_pin *iface, REFI return S_OK; } +static HRESULT file_writer_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct file_writer *filter = impl_from_strmbase_pin(iface); + + if (filter->filename && !IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) + return S_FALSE; + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = file_writer_sink_query_interface, + .base.pin_query_accept = file_writer_sink_query_accept, }; static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filter *iface) diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index 5d8ce45e0d..f5ad897f29 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -31,6 +31,24 @@ static IBaseFilter *create_file_writer(void) return filter; } +static WCHAR *set_filename(IBaseFilter *filter) +{ + static WCHAR filename[MAX_PATH]; + IFileSinkFilter *filesink; + WCHAR path[MAX_PATH]; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(path), path); + GetTempFileNameW(path, L"qfw", 0, filename); + DeleteFileW(filename); + + IBaseFilter_QueryInterface(filter, &IID_IFileSinkFilter, (void **)&filesink); + hr = IFileSinkFilter_SetFileName(filesink, filename, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFileSinkFilter_Release(filesink); + return filename; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -349,6 +367,112 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_file_writer(); + AM_MEDIA_TYPE mt = {{0}}, *pmt; + IEnumMediaTypes *enummt; + WCHAR *filename; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in", &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Audio; + mt.subtype = MEDIASUBTYPE_PCM; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = set_filename(filter); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + memset(&mt, 0, sizeof(AM_MEDIA_TYPE)); + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_PCM; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES, "File should not exist.\n"); +} + +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_file_writer(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filewriter) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -358,6 +482,8 @@ START_TEST(filewriter) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); + test_enum_media_types(); CoUninitialize(); }

1 0

Henri Verbeet : wined3d: Add a miscellaneous state template for the Vulkan adapter.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 599a2992881e91801ba15fea340f5a40e853ba5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=599a2992881e91801ba15fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 02:22:55 2020 +0430 wined3d: Add a miscellaneous state template for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 172 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 172 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 349 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=599a2992881e91801ba1…

1 0