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

Alexandre Julliard : opengl32: Add stub for wglGetDefaultProcAddress().
by Alexandre Julliard 23 Apr '20

23 Apr '20

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

Nikolay Sivov : mf: Add missing IMFMediaEventGenerator query support for sample grabber stream.
by Alexandre Julliard 23 Apr '20

23 Apr '20

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

Nikolay Sivov : mf: Add missing IMFMediaEventGenerator query support for SAR stream.
by Alexandre Julliard 23 Apr '20

23 Apr '20

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

Ziqing Hui : windowscodecs: Implement DdsDecoder_GetFrameCount().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 79664eb1cf37d1e9b888941ea4f90dd220882a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79664eb1cf37d1e9b888941e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 23 17:29:49 2020 +0800 windowscodecs: Implement DdsDecoder_GetFrameCount(). The added tests code is to test the return value of DdsDecoder_GetFrameCount() when decoder is not initialized or parameter is NULL. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 40 ++++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 11 +++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 04914ead3a..19d5dd5a3f 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -94,6 +94,12 @@ typedef struct DdsDecoder { DDS_HEADER_DXT10 header_dxt10; } DdsDecoder; +static inline BOOL has_extended_header(DDS_HEADER *header) +{ + return (header->ddspf.flags & DDPF_FOURCC) && + (header->ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')); +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -202,8 +208,7 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } - if (This->header.ddspf.flags & DDPF_FOURCC && - This->header.ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')) { + if (has_extended_header(&This->header)) { hr = IStream_Read(pIStream, &This->header_dxt10, sizeof(This->header_dxt10), &bytesread); if (FAILED(hr)) goto end; if (bytesread != sizeof(This->header_dxt10)) { @@ -285,9 +290,36 @@ static HRESULT WINAPI DdsDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { - FIXME("(%p) <-- %d: stub.\n", iface, *pCount); + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + UINT arraySize = 1, mipMapCount = 1, depth = 1; + int i; - return E_NOTIMPL; + if (!pCount) return E_INVALIDARG; + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; + + EnterCriticalSection(&This->lock); + + if (This->header.mipMapCount) mipMapCount = This->header.mipMapCount; + if (This->header.depth) depth = This->header.depth; + if (has_extended_header(&This->header) && This->header_dxt10.arraySize) arraySize = This->header_dxt10.arraySize; + + if (depth == 1) { + *pCount = arraySize * mipMapCount; + } else { + *pCount = 0; + for (i = 0; i < mipMapCount; i++) + { + *pCount += depth; + if (depth > 1) depth /= 2; + } + *pCount *= arraySize; + } + + LeaveCriticalSection(&This->lock); + + TRACE("(%p) <-- %d\n", iface, *pCount); + + return S_OK; } static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 99f19eb175..e548ee9655 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -304,17 +304,22 @@ static void test_dds_decoder_frame_count(void) decoder = create_decoder(); if (!decoder) goto next; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok (hr == WINCODEC_ERR_WRONGSTATE, "%d: Expected hr=WINCODEC_ERR_WRONGSTATE, got %x\n", i, hr); + hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=E_INVALIDARG, got %x\n", i, hr); + hr = init_decoder(decoder, stream, S_OK, -1); if (hr != S_OK) goto next; - todo_wine { hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - ok (hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok (hr == S_OK, "%d: GetFrameCount failed, hr=%x\n", i, hr); if (hr == S_OK) { ok (frame_count == test_data[i].expected, "%d: expected frame count %d, got %d\n", i, test_data[i].expected, frame_count); } - }; + hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=S_OK, got %x\n", i, hr); next: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Jacek Caban : include: Don't override keywords with macros on MSVC.
by Alexandre Julliard 23 Apr '20

23 Apr '20

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 : windef.h: Use __thiscall keyword on Clang with MSVC target.
by Alexandre Julliard 23 Apr '20

23 Apr '20

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 23 Apr '20

23 Apr '20

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

Jacek Caban : debug.h: Use GNU style variadic macros on MSVC clang target.
by Alexandre Julliard 23 Apr '20

23 Apr '20

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

Zebediah Figura : qcap/tests: Add tests for file writer pin connection.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: a6e65dbcc640dbea8f4fd8231e5b50262dd16203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e65dbcc640dbea8f4fd823… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:14:09 2020 -0500 qcap/tests: Add tests for file writer pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/filewriter.c | 176 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index f5ad897f29..cfc9e5d634 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_file_writer(void) @@ -473,6 +474,180 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_allocator(IMemInputPin *input, IMemAllocator *allocator) +{ + ALLOCATOR_PROPERTIES props, ret_props; + IMemAllocator *ret_allocator; + HRESULT hr; + + memset(&props, 0xcc, sizeof(props)); + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(props.cbAlign == 512, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + } + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 512; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + if (hr == S_OK) + IMemAllocator_Release(ret_allocator); +} + +static void test_connect_pin(void) +{ + AM_MEDIA_TYPE req_mt = + { + .majortype = {0x1111}, + .subtype = {0x2222}, + .formattype = {0x3333}, + }; + + IBaseFilter *filter = create_file_writer(); + struct testfilter source; + IMemAllocator *allocator; + IMemInputPin *meminput; + IFilterGraph2 *graph; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + HRESULT hr; + ULONG ref; + + set_filename(filter); + + testfilter_init(&source); + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); + hr = IFilterGraph2_AddFilter(graph, filter, L"filewriter"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IBaseFilter_FindPin(filter, L"in", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&meminput); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Stream; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&mt, &req_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + + test_allocator(meminput, allocator); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", source.source.pin.peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMemInputPin_Release(meminput); + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMemAllocator_Release(allocator); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filewriter) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -484,6 +659,7 @@ START_TEST(filewriter) test_pin_info(); test_media_types(); test_enum_media_types(); + test_connect_pin(); CoUninitialize(); }

1 0

Jacek Caban : winbase.h: Unify MSVC interlocked functions declarations.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 4b7b7a5f4c5c4659d210846266f475c13a4119d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7b7a5f4c5c4659d2108462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 01:35:34 2020 +0200 winbase.h: Unify MSVC interlocked functions declarations. And use intrinsic versions on x86. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 101 ++++++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 2aefd0e043..1d8e32d6cb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2904,7 +2904,55 @@ extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); /* Interlocked functions */ -#ifdef __i386__ +#ifdef _MSC_VER + +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) + +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement + +long InterlockedCompareExchange(long volatile*,long,long); +long long InterlockedCompareExchange64(long long volatile*,long long,long long); +long InterlockedDecrement(long volatile*); +long InterlockedExchange(long volatile*,long); +long InterlockedExchangeAdd(long volatile*,long); +long InterlockedIncrement(long volatile*); + +#ifndef __i386__ + +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchangePointer) + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedExchangePointer _InterlockedExchangePointer + +void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *InterlockedExchangePointer(void *volatile*,void*); + +#else + +static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return (void *)InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); +} + +static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + return (void *)InterlockedExchange( (long volatile*)dest, (long)val ); +} + +#endif + +#elif defined(__i386__) # if defined(__GNUC__) && !defined(_NTSYSTEM_) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) @@ -2963,57 +3011,6 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); -#elif defined(_MSC_VER) - -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangePointer) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedDecrement) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( dest, xchg, compare ); -} - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return _InterlockedCompareExchangePointer( dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( dest, xchg, compare ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( dest, val ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - return _InterlockedExchangePointer( dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( dest ); -} - #elif defined(__GNUC__) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare )

1 0