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

Alexandre Julliard : include: Get rid of the DPRINTF() macro.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 3d6febc997c808e7c91289c34f7bb48b8b1fe2bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6febc997c808e7c91289c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:44 2019 +0200 include: Get rid of the DPRINTF() macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/secur32/schannel_macosx.c | 1 - dlls/windowscodecs/icnsformat.c | 1 - dlls/winecoreaudio.drv/audiounit.c | 2 -- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - dlls/winemac.drv/macdrv_cocoa.h | 1 - dlls/wineqtdecoder/qtdatahandler.c | 2 -- dlls/wineqtdecoder/qtsplitter.c | 2 -- dlls/wineqtdecoder/qtutils.c | 2 -- dlls/wineqtdecoder/qtvdecoder.c | 2 -- dlls/winhttp/session.c | 1 - dlls/wininet/internet.c | 1 - dlls/winspool.drv/info.c | 1 - include/wine/debug.h | 2 -- 15 files changed, 21 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a062335..9d83b00 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -31,7 +31,6 @@ #include <CoreServices/CoreServices.h> #undef LoadResource #undef GetCurrentThread -#undef DPRINTF #endif #include <stdio.h> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 333856e..3e4a876 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -61,7 +61,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 981e4fb..050e8c5 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -30,7 +30,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "windef.h" diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 02e8ee9..8194bc5 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -75,7 +75,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #endif #define COBJMACROS diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index b49d214..5f20b3d 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -29,8 +29,6 @@ #include <AudioToolbox/AudioToolbox.h> #undef ULONG #undef HRESULT - -#undef DPRINTF #undef STDMETHODCALLTYPE #include "coreaudio.h" #include "wine/debug.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 28ada43..2f4683a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #undef GetCurrentThread #undef GetCurrentProcess #undef _CDECL -#undef DPRINTF #include "windef.h" #include "winbase.h" diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 011b1ff..6165dc5 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -83,7 +83,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #include <pthread.h> diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index c88b354..30b5161 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -66,7 +66,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -102,7 +101,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include <assert.h> diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c0a9b93..d2255b1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -67,7 +67,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -103,7 +102,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include <assert.h> diff --git a/dlls/wineqtdecoder/qtutils.c b/dlls/wineqtdecoder/qtutils.c index 19ba90c..4c88656 100644 --- a/dlls/wineqtdecoder/qtutils.c +++ b/dlls/wineqtdecoder/qtutils.c @@ -66,7 +66,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -102,7 +101,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include "windef.h" diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 9091da1..46a8ac0 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -67,7 +67,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -103,7 +102,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #define COBJMACROS diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f4f7e41..239b86b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -26,7 +26,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "windef.h" diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6db42d6..b9f9f91 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -34,7 +34,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "winsock2.h" diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 763d244..d7e2211 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -102,7 +102,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #endif #include "wine/library.h" diff --git a/include/wine/debug.h b/include/wine/debug.h index bb72827..6a981d6 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -496,7 +496,6 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) static struct __wine_debug_channel __wine_dbch_##ch = { 0xff, #ch }; \ static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch -#define WINE_DPRINTF wine_dbg_printf #define WINE_MESSAGE wine_dbg_printf #ifdef __WINESRC__ @@ -530,7 +529,6 @@ static inline const char *debugstr_variant( const VARIANT *v ) { return wine_dbg #define ERR_(ch) WINE_ERR_(ch) #define ERR_ON(ch) WINE_ERR_ON(ch) -#define DPRINTF WINE_DPRINTF #define MESSAGE WINE_MESSAGE #endif /* __WINESRC__ */

1 0

Alexandre Julliard : krnl386.exe: Avoid using DPRINTF().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: d708d9e611c4240b3521ebddf24100399761cf41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d708d9e611c4240b3521ebdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:33:48 2019 +0200 krnl386.exe: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/global.c | 14 -------------- dlls/krnl386.exe16/thunk.c | 14 +++++--------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index 8f9ac02..c7ccd2d 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -109,20 +109,6 @@ static GLOBALARENA *GLOBAL_GetArena( WORD sel, WORD selcount ) return pGlobalArena + (sel >> __AHSHIFT); } -void debug_handles(void) -{ - int printed=0; - int i; - for (i = globalArenaSize-1 ; i>=0 ; i--) { - if (pGlobalArena[i].size!=0 && (pGlobalArena[i].handle & 0x8000)){ - printed=1; - DPRINTF("0x%08x, ",pGlobalArena[i].handle); - } - } - if (printed) - DPRINTF("\n"); -} - /*********************************************************************** * GLOBAL_CreateBlock diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 737f6a8..f3ca174 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -1011,13 +1011,9 @@ DWORD WINAPIV SSCall( DWORD i,ret; DWORD *args = ((DWORD *)&fun) + 1; - if(TRACE_ON(thunk)) - { - DPRINTF("(%d,0x%08x,%p,[",nr,flags,fun); - for (i=0;i<nr/4;i++) - DPRINTF("0x%08x,",args[i]); - DPRINTF("])\n"); - } + TRACE("(%d,0x%08x,%p,[",nr,flags,fun); + for (i = 0; i < nr/4; i++) TRACE("0x%08x,",args[i]); + TRACE("])\n"); ret = call_entry_point( fun, nr / sizeof(DWORD), args ); TRACE(" returning %d ...\n",ret); return ret; @@ -2525,10 +2521,10 @@ DWORD WINAPIV WOW16Call(WORD x, WORD y, WORD z, VA_LIST16 args) for (i=0;i<x/2;i++) { WORD a = VA_ARG16(args,WORD); - DPRINTF("%04x ",a); + FIXME("%04x ",a); } calladdr = VA_ARG16(args,DWORD); stack16_pop( 3*sizeof(WORD) + x + sizeof(DWORD) ); - DPRINTF(") calling address was 0x%08x\n",calladdr); + FIXME(") calling address was 0x%08x\n",calladdr); return 0; }

1 0

Zebediah Figura : qcap/tests: Add some tests for querying AVI compressor pin information.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 181e02259dbb28dbc2ade7f3df3f5c2f3ac69136 URL: https://source.winehq.org/git/wine.git/?a=commit;h=181e02259dbb28dbc2ade7f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:58 2019 -0500 qcap/tests: Add some tests for querying AVI compressor pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 540c343..5c60846 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -224,6 +224,57 @@ static void test_find_pin(IBaseFilter *filter) IEnumPins_Release(enum_pins); } +static void test_pin_info(IBaseFilter *filter) +{ + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + todo_wine ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); +} + static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { @@ -292,6 +343,7 @@ START_TEST(avico) test_interfaces(filter); test_enum_pins(filter); test_find_pin(filter); + test_pin_info(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Michael Stefaniuc : msg711.acm: Remove useless casts to self.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 9afa1308c7b1d59deae2fd3e1fc9897bd235f0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afa1308c7b1d59deae2fd3e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:58 2019 +0200 msg711.acm: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index d20c89b..9c44c65 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -542,8 +542,7 @@ static inline unsigned char ulaw2alaw(unsigned char uval) { uval &= 0xff; - return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : - (unsigned char) (0x55 ^ (_u2a[0x7F ^ uval] - 1))); + return (uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : (0x55 ^ (_u2a[0x7F ^ uval] - 1)); } /* -------------------------------------------------------------------------------*/

1 0

Alexandre Julliard : wineps: Avoid using DPRINTF().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 49ab8b1bbf86a222c55827fee9975f9df3ff69c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ab8b1bbf86a222c55827fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:29 2019 +0200 wineps: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2eb03b8..8a1353c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -158,7 +158,7 @@ do \ { \ if (fields & flag) \ { \ - if (add_space++) DPRINTF(" "); \ + if (add_space++) TRACE(" "); \ TRACE(#flag); \ fields &= ~flag; \ } \

1 0

Zebediah Figura : qcap/tests: Add some tests for IBaseFilter::FindPin() on the AVI compressor.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: a604e7d6cc5297138a37bbf7ed0a7ec6fe53f4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a604e7d6cc5297138a37bbf7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:57 2019 -0500 qcap/tests: Add some tests for IBaseFilter::FindPin() on the AVI compressor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 5b01e14..540c343 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -23,6 +23,11 @@ #include "vfw.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n',0}; +static const WCHAR source_id[] = {'O','u','t',0}; +static const WCHAR sink_name[] = {'I','n','p','u','t',0}; +static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; + static const DWORD test_fourcc = mmioFOURCC('w','t','s','t'); #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -186,6 +191,39 @@ static void test_enum_pins(IBaseFilter *filter) IEnumPins_Release(enum1); } +static void test_find_pin(IBaseFilter *filter) +{ + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins didn't match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Pins didn't match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, sink_name, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + hr = IBaseFilter_FindPin(filter, source_name, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + IEnumPins_Release(enum_pins); +} + static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { @@ -253,6 +291,7 @@ START_TEST(avico) test_interfaces(filter); test_enum_pins(filter); + test_find_pin(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : qcap/tests: Add some tests for AVI compressor filter interfaces.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 096cdd4ee7a4e4e70b03cdf73bd0fb24660a2584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=096cdd4ee7a4e4e70b03cdf7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:54 2019 -0500 qcap/tests: Add some tests for AVI compressor filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/avico.c | 146 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/Makefile.in b/dlls/qcap/tests/Makefile.in index 80b1962..2b98847 100644 --- a/dlls/qcap/tests/Makefile.in +++ b/dlls/qcap/tests/Makefile.in @@ -1,7 +1,8 @@ TESTDLL = qcap.dll -IMPORTS = strmiids uuid oleaut32 ole32 advapi32 +IMPORTS = strmiids uuid oleaut32 ole32 advapi32 msvfw32 C_SRCS = \ audiorecord.c \ + avico.c \ qcap.c \ smartteefilter.c diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c new file mode 100644 index 0000000..53856d6 --- /dev/null +++ b/dlls/qcap/tests/avico.c @@ -0,0 +1,146 @@ +/* + * AVI compressor filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "vfw.h" +#include "wine/test.h" + +static const DWORD test_fourcc = mmioFOURCC('w','t','s','t'); + +#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 *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(IBaseFilter *filter) +{ + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IPersistPropertyBag, 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_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); +} + +static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, + LPARAM lparam1, LPARAM lparam2) +{ + static const WCHAR nameW[] = {'f','o','o',0}; + if (winetest_debug > 1) trace("msg %#x, lparam1 %#lx, lparam2 %#lx.\n", msg, lparam1, lparam2); + + switch (msg) + { + case DRV_LOAD: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_FREE: + return 1; + case ICM_GETINFO: + { + ICINFO *info = (ICINFO *)lparam1; + info->fccType = ICTYPE_VIDEO; + info->fccHandler = test_fourcc; + info->dwFlags = VIDCF_TEMPORAL; + info->dwVersion = 0x10101; + info->dwVersionICM = ICVERSION; + lstrcpyW(info->szName, nameW); + lstrcpyW(info->szDescription, nameW); + return sizeof(ICINFO); + } + } + + return 0; +} + +START_TEST(avico) +{ + static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', + 'c','m',':','{','3','3','D','9','A','7','6','0','-','9','0','C','8', + '-','1','1','D','0','-','B','D','4','3','-','0','0','A','0','C','9', + '1','1','C','E','8','6','}','\\','w','t','s','t',0}; + ICreateDevEnum *devenum; + IEnumMoniker *enummon; + IBaseFilter *filter; + IMoniker *mon; + WCHAR *name; + HRESULT hr; + ULONG ref; + BOOL ret; + + ret = ICInstall(ICTYPE_VIDEO, test_fourcc, (LPARAM)driver_proc, NULL, ICINSTALL_FUNCTION); + ok(ret, "Failed to install test VFW driver.\n"); + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ICreateDevEnum, (void **)&devenum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ICreateDevEnum_CreateClassEnumerator(devenum, &CLSID_VideoCompressorCategory, &enummon, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumMoniker_Next(enummon, 1, &mon, NULL) == S_OK) + { + hr = IMoniker_GetDisplayName(mon, NULL, NULL, &name); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (!lstrcmpW(name, test_display_name)) + { + hr = IMoniker_BindToObject(mon, NULL, NULL, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_interfaces(filter); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + CoTaskMemFree(name); + + IMoniker_Release(mon); + } + + IEnumMoniker_Release(enummon); + ICreateDevEnum_Release(devenum); + + ret = ICRemove(ICTYPE_VIDEO, test_fourcc, 0); + ok(ret, "Failed to remove test driver.\n"); + + CoUninitialize(); +}

1 0

Zebediah Figura : qcap/tests: Add some tests for IPersistPropertyBag on the audio capture filter.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 92cd2158e62076ce37e5a58dbe1dfc4ba0056dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=92cd2158e62076ce37e5a58d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:53 2019 -0500 qcap/tests: Add some tests for IPersistPropertyBag on the audio capture filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index fb292cf..5de0198 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -58,6 +58,92 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVideoWindow, FALSE); } +static HRESULT WINAPI property_bag_QueryInterface(IPropertyBag *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call (iid %s).\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI property_bag_AddRef(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 2; +} + +static ULONG WINAPI property_bag_Release(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; +} + +static const WCHAR waveinidW[] = {'W','a','v','e','I','n','I','d',0}; +static const WCHAR usemixerW[] = {'U','s','e','M','i','x','e','r',0}; +static int ppb_id; +static unsigned int ppb_got_read; + +static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) +{ + if (!lstrcmpW(name, usemixerW)) + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + todo_wine ok(!lstrcmpW(name, waveinidW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + ok(V_VT(var) == VT_I4, "Got unexpected type %u.\n", V_VT(var)); + ok(!log, "Got unexpected error log %p.\n", log); + ppb_got_read++; + return S_OK; +} + +static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, VARIANT *var) +{ + ok(0, "Unexpected call (name %s).\n", wine_dbgstr_w(name)); + return E_FAIL; +} + +static const IPropertyBagVtbl property_bag_vtbl = +{ + property_bag_QueryInterface, + property_bag_AddRef, + property_bag_Release, + property_bag_Read, + property_bag_Write, +}; + +static void test_property_bag(IMoniker *mon) +{ + IPropertyBag property_bag = {&property_bag_vtbl}; + IPropertyBag *devenum_bag; + IPersistPropertyBag *ppb; + VARIANT var; + HRESULT hr; + ULONG ref; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&devenum_bag); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(devenum_bag, waveinidW, &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ppb_id = V_I4(&var); + + hr = CoCreateInstance(&CLSID_AudioRecord, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistPropertyBag, (void **)&ppb); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPersistPropertyBag_InitNew(ppb); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ppb_got_read = 0; + hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); + ok(hr == S_OK || broken(hr == E_FAIL) /* 8+, intermittent */, "Got hr %#x.\n", hr); + ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read); + + ref = IPersistPropertyBag_Release(ppb); + ok(!ref, "Got unexpected refcount %d.\n", ref); + + VariantClear(&var); + IPropertyBag_Release(devenum_bag); +} + START_TEST(audiorecord) { ICreateDevEnum *devenum; @@ -89,6 +175,8 @@ START_TEST(audiorecord) trace("Testing device %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); + test_property_bag(mon); + hr = IMoniker_BindToObject(mon, NULL, NULL, &IID_IBaseFilter, (void **)&filter); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : qcap/tests: Add some tests for audio capture filter interfaces.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 08f2c022e58f3c1c667293cd0c4a9b12651f7666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f2c022e58f3c1c667293cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:52 2019 -0500 qcap/tests: Add some tests for audio capture filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/Makefile.in | 1 + dlls/qcap/tests/audiorecord.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dlls/qcap/tests/Makefile.in b/dlls/qcap/tests/Makefile.in index 7a6336b..80b1962 100644 --- a/dlls/qcap/tests/Makefile.in +++ b/dlls/qcap/tests/Makefile.in @@ -2,5 +2,6 @@ TESTDLL = qcap.dll IMPORTS = strmiids uuid oleaut32 ole32 advapi32 C_SRCS = \ + audiorecord.c \ qcap.c \ smartteefilter.c diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c new file mode 100644 index 0000000..fb292cf --- /dev/null +++ b/dlls/qcap/tests/audiorecord.c @@ -0,0 +1,103 @@ +/* + * Audio capture filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +#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 *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(IBaseFilter *filter) +{ + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IPersistPropertyBag, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + 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_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); +} + +START_TEST(audiorecord) +{ + ICreateDevEnum *devenum; + IEnumMoniker *enummon; + IBaseFilter *filter; + IMoniker *mon; + WCHAR *name; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ICreateDevEnum, (void **)&devenum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ICreateDevEnum_CreateClassEnumerator(devenum, &CLSID_AudioInputDeviceCategory, &enummon, 0); + if (hr == S_FALSE) + { + skip("No audio input devices present.\n"); + ICreateDevEnum_Release(devenum); + CoUninitialize(); + return; + } + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumMoniker_Next(enummon, 1, &mon, NULL) == S_OK) + { + hr = IMoniker_GetDisplayName(mon, NULL, NULL, &name); + ok(hr == S_OK, "Got hr %#x.\n", hr); + trace("Testing device %s.\n", wine_dbgstr_w(name)); + CoTaskMemFree(name); + + hr = IMoniker_BindToObject(mon, NULL, NULL, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_interfaces(filter); + + IMoniker_Release(mon); + } + + IEnumMoniker_Release(enummon); + ICreateDevEnum_Release(devenum); + CoUninitialize(); +}

1 0

Nikolay Sivov : mfreadwrite/tests: Add missing return value check ( Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: a8a4a8d2a50baeb7526a172194d814d56c023a15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a4a8d2a50baeb7526a1721… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 22:02:42 2019 +0300 mfreadwrite/tests: Add missing return value check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 5f664b3..490b84d 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -120,5 +120,6 @@ START_TEST(mfplat) test_MFCreateSourceReaderFromByteStream(); test_factory(); - MFShutdown(); + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); }

1 0