February 2019 - Wine-commits

Alexandre Julliard : hal: Specify fastcall entry points using the appropriate spec file flag.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: e22fda846393307d11cf1a1df729e8daf3deb20c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e22fda846393307d11cf1a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 17:13:28 2019 +0100 hal: Specify fastcall entry points using the appropriate spec file flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 60 +++++++++++++++++++++++++++---------------------------- dlls/hal/hal.spec | 18 ++++++++--------- 2 files changed, 38 insertions(+), 40 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 6ef8765..d663c44 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -35,19 +35,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ -#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ - __ASM_STDCALL_FUNC( name, 4, \ +#define DEFINE_FASTCALL1_WRAPPER(func) \ + __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(4)) -#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ - __ASM_STDCALL_FUNC( name, 8, \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) ) +#define DEFINE_FASTCALL_WRAPPER(func,args) \ + __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ - "jmp " __ASM_NAME("__regs_") #name __ASM_STDCALL(8)) + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#else +#define DEFINE_FASTCALL1_WRAPPER(func) /* nothing */ +#define DEFINE_FASTCALL_WRAPPER(func,args) /* nothing */ +#endif + +#ifdef __i386__ extern void * WINAPI call_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( call_fastcall_func1, 8, @@ -66,30 +72,30 @@ __ASM_STDCALL_FUNC( call_fastcall_func2, 12, extern void WINAPI ExAcquireFastMutexUnsafe( FAST_MUTEX * ); -DEFINE_FASTCALL1_ENTRYPOINT( ExAcquireFastMutex ) -void WINAPI DECLSPEC_HIDDEN __regs_ExAcquireFastMutex( FAST_MUTEX *mutex ) +DEFINE_FASTCALL1_WRAPPER( ExAcquireFastMutex ) +void WINAPI ExAcquireFastMutex( FAST_MUTEX *mutex ) { call_fastcall_func1( ExAcquireFastMutexUnsafe, mutex ); } extern void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX * ); -DEFINE_FASTCALL1_ENTRYPOINT( ExReleaseFastMutex ) -void WINAPI DECLSPEC_HIDDEN __regs_ExReleaseFastMutex( FAST_MUTEX *mutex ) +DEFINE_FASTCALL1_WRAPPER( ExReleaseFastMutex ) +void WINAPI ExReleaseFastMutex( FAST_MUTEX *mutex ) { call_fastcall_func1( ExReleaseFastMutexUnsafe, mutex ); } -DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) -BOOLEAN WINAPI DECLSPEC_HIDDEN __regs_ExTryToAcquireFastMutex( FAST_MUTEX *mutex ) +DEFINE_FASTCALL1_WRAPPER( ExTryToAcquireFastMutex ) +BOOLEAN WINAPI ExTryToAcquireFastMutex( FAST_MUTEX *mutex ) { TRACE("mutex %p.\n", mutex); return (InterlockedCompareExchange( &mutex->Count, 0, 1 ) == 1); } -DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) -KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfAcquireSpinLock( KSPIN_LOCK *lock ) +DEFINE_FASTCALL1_WRAPPER( KfAcquireSpinLock ) +KIRQL WINAPI KfAcquireSpinLock( KSPIN_LOCK *lock ) { KIRQL irql; KeAcquireSpinLock( lock, &irql ); @@ -103,8 +109,8 @@ void WINAPI KeAcquireSpinLock( KSPIN_LOCK *lock, KIRQL *irql ) *irql = 0; } -DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) -void WINAPI DECLSPEC_HIDDEN __regs_KfReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) +DEFINE_FASTCALL_WRAPPER( KfReleaseSpinLock, 8 ) +void WINAPI KfReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) { KeReleaseSpinLock( lock, irql ); } @@ -117,39 +123,31 @@ void WINAPI KeReleaseSpinLock( KSPIN_LOCK *lock, KIRQL irql ) extern void WINAPI KeAcquireInStackQueuedSpinLockAtDpcLevel( KSPIN_LOCK *, KLOCK_QUEUE_HANDLE * ); -DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) -void WINAPI DECLSPEC_HIDDEN __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) +DEFINE_FASTCALL_WRAPPER( KeAcquireInStackQueuedSpinLock, 8 ) +void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *lock, KLOCK_QUEUE_HANDLE *queue ) { call_fastcall_func2( KeAcquireInStackQueuedSpinLockAtDpcLevel, lock, queue ); } extern void WINAPI KeReleaseInStackQueuedSpinLockFromDpcLevel( KLOCK_QUEUE_HANDLE * ); -DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLock ) -void WINAPI DECLSPEC_HIDDEN __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *queue ) +DEFINE_FASTCALL1_WRAPPER( KeReleaseInStackQueuedSpinLock ) +void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *queue ) { call_fastcall_func1( KeReleaseInStackQueuedSpinLockFromDpcLevel, queue ); } #endif /* __i386__ */ #if defined(__i386__) || defined(__arm__) || defined(__aarch64__) -#ifdef DEFINE_FASTCALL1_ENTRYPOINT -DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) -VOID WINAPI DECLSPEC_HIDDEN __regs_KfLowerIrql(KIRQL NewIrql) -#else + +DEFINE_FASTCALL1_WRAPPER( KfLowerIrql ) VOID WINAPI KfLowerIrql(KIRQL NewIrql) -#endif { FIXME( "(%u) stub!\n", NewIrql ); } - -#ifdef DEFINE_FASTCALL1_ENTRYPOINT -DEFINE_FASTCALL1_ENTRYPOINT( KfRaiseIrql ) -KIRQL WINAPI DECLSPEC_HIDDEN __regs_KfRaiseIrql(KIRQL NewIrql) -#else +DEFINE_FASTCALL1_WRAPPER( KfRaiseIrql ) KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) -#endif { FIXME( "(%u) stub!\n", NewIrql ); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 16822fc..d44ffb9 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,22 +1,22 @@ -@ stdcall -arch=i386 -norelay ExAcquireFastMutex(ptr) -@ stdcall -arch=i386 -norelay ExReleaseFastMutex(ptr) -@ stdcall -arch=i386 -norelay ExTryToAcquireFastMutex(ptr) +@ stdcall -fastcall -arch=i386 ExAcquireFastMutex(ptr) +@ stdcall -fastcall -arch=i386 ExReleaseFastMutex(ptr) +@ stdcall -fastcall -arch=i386 ExTryToAcquireFastMutex(ptr) @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stdcall -arch=i386 -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) +@ stdcall -fastcall -arch=i386 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch @ stub KeAcquireSpinLockRaiseToSynch -@ stdcall -arch=i386 -norelay KeReleaseInStackQueuedSpinLock(ptr) +@ stdcall -fastcall -arch=i386 KeReleaseInStackQueuedSpinLock(ptr) @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stdcall -arch=i386 -norelay KfAcquireSpinLock(ptr) -@ stdcall -arch=arm,arm64,i386 -norelay KfLowerIrql(long) -@ stdcall -arch=arm,arm64,i386 -norelay KfRaiseIrql(long) -@ stdcall -arch=i386 -norelay KfReleaseSpinLock(ptr long) +@ stdcall -fastcall -arch=i386 KfAcquireSpinLock(ptr) +@ stdcall -fastcall -arch=arm,arm64,i386 KfLowerIrql(long) +@ stdcall -fastcall -arch=arm,arm64,i386 KfRaiseIrql(long) +@ stdcall -fastcall -arch=i386 KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted

1 0

Alexandre Julliard : ntoskrnl.exe: Specify fastcall entry points using the appropriate spec file flag.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 556bc0375843f4d8de78f505a606881d75ea8649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=556bc0375843f4d8de78f505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 17:14:38 2019 +0100 ntoskrnl.exe: Specify fastcall entry points using the appropriate spec file flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 61 ++++++--------------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 38 ++++++++++----------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 23 ++++++------- dlls/ntoskrnl.exe/sync.c | 65 ++++++++---------------------------- 4 files changed, 53 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=556bc0375843f4d8de78…

1 0

Michael Stefaniuc : shlwapi: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 500c5d1216d4c91d10ecd133f718eb07218eb56e URL: https://source.winehq.org/git/wine.git/?a=commit;h=500c5d1216d4c91d10ecd133… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:32 2019 +0100 shlwapi: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index d400f8b..7b8473a 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1527,8 +1527,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, if (!src) { WARN("Invalid lpStrRet would crash under Win32!\n"); - if (dest) - *dest = '\0'; + *dest = '\0'; return E_FAIL; }

1 0

Michael Stefaniuc : msvcrt: Remove redundant not-NULL check (coccinellery) .
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: cc12c0af716581b4c1339b4f9f612e2b350ffe50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc12c0af716581b4c1339b4f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:34 2019 +0100 msvcrt: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9b22adc..1ea8163 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2395,7 +2395,7 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, } } - if(size<count && wcstr) + if(size<count) wcstr[size] = '\0'; return size;

1 0

Michael Stefaniuc : pdh: Remove redundant not-NULL check (coccinellery).
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 3215c7e3c8c39ba6a3ba3fcc54a960e5a982d9ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3215c7e3c8c39ba6a3ba3fcc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:35 2019 +0100 pdh: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index bc3674a..7ef91f1 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -898,9 +898,9 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR { int required = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); - if (size && *size < required) ret = PDH_MORE_DATA; + if (*size < required) ret = PDH_MORE_DATA; else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); - if (size) *size = required; + *size = required; } heap_free( machineW ); return ret;

1 0

Zebediah Figura : quartz/tests: Add some tests for media types.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 860033385b59dff0530ff88d843cf88a7e08f907 URL: https://source.winehq.org/git/wine.git/?a=commit;h=860033385b59dff0530ff88d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:12:58 2019 -0600 quartz/tests: Add some tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f164..a2c0fba 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &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); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + 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); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &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_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c..d4547cd 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ]

1 0

Zebediah Figura : quartz/tests: Add some tests for pin interfaces.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: d9456cc996b2f609d21317270576b4812308c9e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9456cc996b2f609d2131727… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:12:59 2019 -0600 quartz/tests: Add some tests for pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index a2c0fba..7155be5 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -120,7 +120,10 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { + const WCHAR *filename = load_resource(avifile); IBaseFilter *filter = create_avi_splitter(); + IFilterGraph2 *graph = connect_input(filter, filename); + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -140,7 +143,33 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_name, &pin); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMemInputPin, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); + IFilterGraph2_Release(graph); + DeleteFileW(filename); } static void test_enum_pins(void)

1 0

Zebediah Figura : quartz/tests: Clean up test_query_interface().
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 42263f9ae4b08b6685c26a1e03abe9feea011350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42263f9ae4b08b6685c26a1e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:13:00 2019 -0600 quartz/tests: Clean up test_query_interface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 70 +++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 591e527..caadfbe 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1,5 +1,5 @@ /* - * Unit tests for the MPEG-1 stream splitter functions + * MPEG-1 splitter filter unit tests * * Copyright 2015 Anton Baskanov * @@ -19,40 +19,64 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" +#include "wine/test.h" -static IUnknown *create_mpeg_splitter(void) +static IBaseFilter *create_mpeg_splitter(void) { - IUnknown *mpeg_splitter = NULL; - HRESULT result = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&mpeg_splitter); - ok(S_OK == result, "got 0x%08x\n", result); - return mpeg_splitter; + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static void test_query_interface(void) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { - IUnknown *mpeg_splitter = create_mpeg_splitter(); - - IAMStreamSelect *stream_select = NULL; - HRESULT result = IUnknown_QueryInterface( - mpeg_splitter, &IID_IAMStreamSelect, (void **)&stream_select); - ok(S_OK == result, "got 0x%08x\n", result); - if (S_OK == result) - { - IAMStreamSelect_Release(stream_select); - } - - IUnknown_Release(mpeg_splitter); + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_mpeg_splitter(); + + check_interface(filter, &IID_IAMStreamSelect, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); } START_TEST(mpegsplit) { CoInitialize(NULL); - test_query_interface(); + test_interfaces(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add a test mp3 file.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 194f765ba58ee094dab3bc86654aa2b91fe75c5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=194f765ba58ee094dab3bc86… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 00:13:01 2019 -0600 quartz/tests: Add a test mp3 file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 64 ++++++++++++++++++++++++---------------- dlls/quartz/tests/rsrc.rc | 6 ++++ dlls/quartz/tests/test.mp3 | Bin 0 -> 2349 bytes 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 897ba3a..88d964c 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -41,6 +41,7 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static WCHAR *load_resource(const WCHAR *name) { @@ -530,57 +531,63 @@ todo_wine IMediaFilter_Release(filter); } -static void rungraph(IFilterGraph2 *graph) +static void rungraph(IFilterGraph2 *graph, BOOL video) { - test_basic_video(graph); + if (video) + test_basic_video(graph); test_media_seeking(graph); test_state_change(graph); test_media_event(graph); } -static HRESULT test_graph_builder_connect_file(WCHAR *filename) +static HRESULT test_graph_builder_connect_file(WCHAR *filename, BOOL audio, BOOL video) { static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; - static const WCHAR inW[] = {'I','n',0}; - IBaseFilter *source_filter, *video_filter; + IBaseFilter *source_filter, *renderer; IPin *pin_in, *pin_out; IFilterGraph2 *graph; - IVideoWindow *window; + IEnumPins *enumpins; HRESULT hr; + if (video) + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&renderer); + else + hr = CoCreateInstance(&CLSID_AudioRender, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&renderer); + if (hr == VFW_E_NO_AUDIO_HARDWARE) + return VFW_E_CANNOT_CONNECT; + ok(hr == S_OK, "Got hr %#x.\n", hr); + graph = create_graph(); - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (void **)&window); - ok(hr == S_OK, "Failed to create VideoRenderer: %#x\n", hr); + IBaseFilter_EnumPins(renderer, &enumpins); + IEnumPins_Next(enumpins, 1, &pin_in, NULL); + IEnumPins_Release(enumpins); hr = IFilterGraph2_AddSourceFilter(graph, filename, NULL, &source_filter); ok(hr == S_OK, "AddSourceFilter failed: %#x\n", hr); - hr = IVideoWindow_QueryInterface(window, &IID_IBaseFilter, (void **)&video_filter); - ok(hr == S_OK, "QueryInterface(IBaseFilter) failed: %#x\n", hr); - hr = IFilterGraph2_AddFilter(graph, video_filter, NULL); + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); ok(hr == S_OK, "AddFilter failed: %#x\n", hr); hr = IBaseFilter_FindPin(source_filter, outputW, &pin_out); ok(hr == S_OK, "FindPin failed: %#x\n", hr); - hr = IBaseFilter_FindPin(video_filter, inW, &pin_in); - ok(hr == S_OK, "FindPin failed: %#x\n", hr); hr = IFilterGraph2_Connect(graph, pin_out, pin_in); if (SUCCEEDED(hr)) - rungraph(graph); + rungraph(graph, video); IPin_Release(pin_in); IPin_Release(pin_out); IBaseFilter_Release(source_filter); - IBaseFilter_Release(video_filter); - IVideoWindow_Release(window); + IBaseFilter_Release(renderer); IFilterGraph2_Release(graph); return hr; } -static void test_render_run(const WCHAR *file) +static void test_render_run(const WCHAR *file, BOOL audio, BOOL video) { IFilterGraph2 *graph; HANDLE h; @@ -608,19 +615,25 @@ static void test_render_run(const WCHAR *file) refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); - hr = test_graph_builder_connect_file(filename); + hr = test_graph_builder_connect_file(filename, audio, video); ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr); } else { - ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); - rungraph(graph); + if (audio) + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "Got hr %#x.\n", hr); + else + ok(hr == S_OK, "Got hr %#x.\n", hr); + rungraph(graph, video); refs = IFilterGraph2_Release(graph); ok(!refs, "Graph has %u references\n", refs); - hr = test_graph_builder_connect_file(filename); - ok(hr == S_OK || hr == VFW_S_PARTIAL_RENDER, "got %#x\n", hr); + hr = test_graph_builder_connect_file(filename, audio, video); + if (audio && video) + todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr); + else + ok(hr == S_OK, "Got hr %#x.\n", hr); } /* check reference leaks */ @@ -737,7 +750,7 @@ todo_wine ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); if (SUCCEEDED(hr)) - rungraph(graph); + rungraph(graph, TRUE); return 0; } @@ -3199,8 +3212,9 @@ START_TEST(filtergraph) CoInitializeEx(NULL, COINIT_MULTITHREADED); test_interfaces(); - test_render_run(avifile); - test_render_run(mpegfile); + test_render_run(avifile, FALSE, TRUE); + test_render_run(mpegfile, TRUE, TRUE); + test_render_run(mp3file, TRUE, FALSE); test_enum_filters(); test_graph_builder_render(); test_graph_builder_connect(); diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 9bea5be..282cb1f 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -20,8 +20,14 @@ #include "windef.h" +/* ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi */ /* @makedep: test.avi */ test.avi RCDATA "test.avi" +/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" + +/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */ +/* @makedep: test.mp3 */ +test.mp3 RCDATA "test.mp3" diff --git a/dlls/quartz/tests/test.mp3 b/dlls/quartz/tests/test.mp3 new file mode 100644 index 0000000..78d8dd2 Binary files /dev/null and b/dlls/quartz/tests/test.mp3 differ

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 28 Feb '19

28 Feb '19

Module: wine Branch: master Commit: 6d797df937919b17ffd6b84330ead8a34128ea49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d797df937919b17ffd6b843… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 28 10:12:53 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index b34e78e..1ddac18 100644 --- a/po/fi.po +++ b/po/fi.po @@ -16284,10 +16284,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstitiedostot (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode-tekstitiedosto (*.txt)" +msgstr "Unicode-tekstitiedostot (*.txt)" #: wordpad.rc:150 msgid "Rich text format (*.rtf)"

1 0